[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 7316f4cbd6 -s ours

am skip reason: subject contains skip directive

Change-Id: I14f77e3724f4ba0887e244a952215638f2deeaff
tree: e5dc3e5fed89348ba7fcbf1687b901eece6b04da
  1. 5.4-arm64/
  2. 5.4-x86_64/
  3. scripts/
  4. Android.bp
  5. OWNERS
  6. TEST_MAPPING