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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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