[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 6b9108352d -s ours

am skip reason: Change-Id Icca07a3dbf948c4d35809c952458d48bd075951e with SHA-1 c861cf0254 is in history

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

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