[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 6b9108352d -s ours am: d97b89ba02 -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: Id58b5f1a9b1a5c86630e14bb5a5168208757d877