DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I2e9e2cd25b8289b1027fef76be49377ef0ab0a75
tree: fcc0349353273aa62f307117a83b9f1fdb7bbef0
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml