DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: If20125b79df6624dbdbd39ef6f1661473fa03972
Change-Id: I7e8550ebfa2925cece5a9dfd18e0a0eba8eaaa05
tree: d0206a9349419fa2403d8f63819909d2b8373519
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags