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

Bug: 264720040
Merged-In: Id7c81f4dd9d7aa584e5221fcde0dc5d8a0b4d637
Change-Id: I67629646d63bf309b346acd90b1a468255482f81
tree: b626b71aefc51f5e7839faf910958768413c58b6
  1. proto/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. proguard.flags