Merge "Handle PendingIntent cancellation v2" into rvc-dev