Merge "Fix AppPredictionService callbacks comparison" into tm-qpr-dev am: c2e3ec39

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20585072



Change-Id: I286d15bb1e8e3e0ca1881008c97143fbf12b7186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>