[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 67bc2e703c -s ours am: ed6657fcfb

Change-Id: I2504e27d1ccb4b08c7ef362424b4d9f2e3337571
tree: b46d585fa895c0a2c3cab6e462e8ae26d9d4ee0f
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags