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

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