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

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

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



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