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

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

Change-Id: Ibe38cf1c37027025c36411119b49b38e18082589