DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: Icb1dea90be83e2f31cf954400ff83a76e55c73e4
Change-Id: I228c49e4f6a7bcb310ab5b9e8d963128abc0f69a
tree: 2d066e8c99fee816713015e728a6c2841a2b7f1a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS