Merge "Merge "Make sure PendingIntent cancel listener is unregistered" into...

Merge "Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31 am: 8c7fa9de" into rvc-d1-dev-plus-aosp am: c27eecd1

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

Change-Id: I17af77f67900697d92b3cbcacd6db8a0c14d921a