Merge "Merge "Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31a2 am: 8c7fa9de80" into rvc-d1-dev-plus-aosp am: c27eecd16d" into rvc-qpr-dev-plus-aosp