Merge "Fix AppPrediction/Smartspace leak" into tm-qpr-dev am: 4f934d7825 am: ba101c125f

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

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