[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 560d84f535 -s ours am: 6c82caa1e8 am: efeaa22db2

Change-Id: Ib22f79526c33459e3a58b463e40f5deba0d3839e
tree: b111d4be8df27ec2039f8a213c007ecfa82b74fc
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. proguard.flags
  5. res/
  6. src/