Merge "Only clean the client if no pending intent exist." into tm-qpr-dev am: 4f375f85

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



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