DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: I630bdfee09afa81be4490b961d66dde18de0b6b7
Change-Id: I5a1f8c3e38d4a409dede7d202116e4771f6081d0
tree: 79dc4d7efbc1a5f8d9ddc3382a57cc584385c374
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml