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

Bug: 151763422
Change-Id: Icdc1742d312d8feeb3e500a2581f40aff61d48d0
tree: d2d738038796a298243d98b4a8d32e328178ccfc
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg