Merge RQ2A.210305.007

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