Merge RQ2A.210305.007

Bug: 180401296
Merged-In: Ib9cb3a1ca7c13f25deed13258f2d73c19c4f0c2f
Change-Id: I12472401914d99cacd2c38612c7b37b2b782c393
tree: e51223193e435a3569b3c1bda108ffb5e6218cd9
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg