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

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

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



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