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

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



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