Merge "Expose PendingIntent.addCancelListener"