DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: I28413a724b78b5e58460715c6068bca78130c635
Change-Id: Ib461c53724a06ed0251969d7e38f087824a62ae5
tree: ecbddda007e3052e25da0b87f15ffc6c6fba6518
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS