DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: Ie9ec0166f99388cc4f7eb362c1df9f0328ff2be0
Change-Id: Ia7f277f2cf1c720e12b4dd606505f283245d8520
tree: 9a249865dddb303655f4db4f231abf99ad5f4aaf
  1. proto/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS