Merge "Fix AppPrediction/Smartspace leak" into tm-dev am: 8683e320 am: 59834082

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



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