Merge "fix app prediction service doesn't clean-up properly." into rvc-qpr-dev am: 4cb7d8c8

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

Change-Id: I880aa857e53bc499837b8cb2c1eeff84137a55be