Merge "Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31 am: 8c7fa9de" into rvc-d1-dev-plus-aosp