Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am: 7f042aaa am: 55cafb55 Change-Id: I0c5091da6edd1cbd20f5ccd6e23bdb16811adae9