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

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

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

Change-Id: I5ec77ed5785cd9ac1d2be7007bdff9cad94b0fb3