Merge branch android10-qpr2-release

Change-Id: I641d56bc9abcada80bec9b3c5fdf1c02e03eda56
tree: 8c3210ebf8282105da3271fe94b5bd9ab6f50c6d
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS