Merge RQ2A.210305.007

Bug: 180401296
Merged-In: I2532eb50d94d626eddd1ce7eb6b1cfa6c2d6ebfe
Change-Id: Id23c19d0dabb46cde837fadc13f009935fa7e6f1
tree: bf5dac8c6bc7ff60e0b75d461ad4c600e84031b8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS