DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master

Bug: 151763422
Change-Id: If0fc71f9fe378a275967720ea56c2d121ae5c755
tree: 550e729cfd0f9c1e68940bf4a59a1bc53ae1cbe6
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg