[automerger skipped] Merge mpr-2021-09-05 skipped: 28186630e4

Change-Id: Id9028dbf1b61cec0d8f034c0018f7bfcea3d129d
tree: 857c06d175eb126d3bf461cad47007d867281814
  1. src/
  2. Android.bp
  3. AndroidManifest.xml