DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: I9d3e50b706f97002b3a6aa2ddf325f5bfe2d3fb8
Change-Id: I00b02fae2e25724bc8fa897224841642a8bf53a8
tree: bf5dac8c6bc7ff60e0b75d461ad4c600e84031b8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS