DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master

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