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: 17b5e3d4 am: 6a3f9562" into rvc-qpr-dev-plus-aosp am: 1967ae18

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

Change-Id: I6283098923131b32096be0ae164ac43acb9c184b