Merge "Fix AppPrediction/Smartspace leak" into tm-dev am: 8683e320 am: 9737d33e am: a6e81f57

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



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