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