Merge RQ2A.210305.007

Bug: 180401296
Merged-In: Ibc932c4e3c33d11d8b10d7bfb30c82c79b5d5b88
Change-Id: I9ecb39fa086131139d4bf5b664e6a477ed5cec59
tree: ba6d73737f1330d5948be6667066e89c3f6094d5
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml