Merge "Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31 am: 17b5e3d4 am: 6a3f9562" into rvc-qpr-dev-plus-aosp