Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31a2 am: 17b5e3d4ae am: 6a3f9562fd

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

Change-Id: Ia99574169c4d1da1b2d540d40b5c1ce0485e2f6d