Merge "Merge "Fix AppPrediction/Smartspace leak" into tm-dev am: 8683e320 am: 9737d33e" into tm-d1-dev-plus-aosp am: 565a865e am: 6e3e5562

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



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