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

Bug: 264720040
Merged-In: If4b151e54d9cc99ebbe4561243f385ed1fbb5583
Change-Id: I6e0b3accbaebb1027349feb6b10289450df3da73
tree: f262a970b2b3dad07cd3215cdfab709c2f2a2ac1
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml