[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 8022f45838 -s ours am: 7825e69ae6 -s ours

am skip reason: Change-Id Ia239a6ba82bf17b2a80bdc734646123a9afb85bb with SHA-1 6b9108352d is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/OnDeviceAppPrediction/+/1521196

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id955c23cd4ef7f20518193a7cc3030be5045fc84
tree: 0cda4b5a2de6d23d7064eab87e662054c9226839
  1. Android.bp
  2. AndroidManifest.xml
  3. src/