DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master

Bug: 151763422
Change-Id: Ibc62944c4803255a25a250ebdde02029955d989d
tree: 028bdd1c06ce2cca8a074c5281970a978cec3031
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS