Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31a2 am: 8c7fa9de80 am: 6f9511d8a4

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

Change-Id: Ia8601c2fca67eea978bbd644080698d4efc9f95b