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

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

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

Change-Id: Ic2439e9b3b49043dac7f8f1fb2c09610fdacc9f8