Merge tm-qpr-dev-plus-aosp-without-vendor@9467136

Bug: 264720040
Merged-In: I8c2bdef3e3cfe107b13dade69e33ce48fda5d713
Change-Id: I4bbe27935e689ecb45772bde28cce9ce6c9d3726
tree: dead0ce43131376ccbcb371fe51526a3a1a36be5
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml