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

Bug: 248070379
Merged-In: I44427f087ed2bba09c974c8c6b8cbe5f87f74868
Change-Id: I34c39491c089c6edddf71c213d2a5eae2f9e53fd
tree: ca6299f625e7ac9b4b223266af5156f519d7050b
  1. res/
  2. robotests/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. OWNERS