DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: I3d6ebd1deb09008f9746fc54d1e6614948f64f13
Change-Id: I1f243bda2d00c980e19b75091a87e81cdedc2d21
tree: 776bcdc9798f1ba3688a99a49c56fd2bf339a250
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg