[automerger skipped] Merge "Only clean the client if no pending intent exist."...

[automerger skipped] Merge "Only clean the client if no pending intent exist." into tm-qpr-dev am: 4f375f85 am: 73956d07 -s ours

am skip reason: Merged-In I683ad404ffbd25359c795a72cc7620531d037197 with SHA-1 d84c53b9 is already in history

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



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