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

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

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



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