Merge RQ2A.210305.007

Bug: 180401296
Merged-In: I590214314e2246f34f419ec80239ad8b7446ed87
Change-Id: I62a31ca3878feff0ef8ee85ccbd6f4301c1701d3
tree: b7fa5aa790435caa72b64f98eacba31729a2fa2d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS