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

Bug: 151763422
Change-Id: I741fd6bf98bdfd57a381140231c4ba171af65894
tree: d9e98023fef26d36d84daba1402f27b6b24ad28b
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS