Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am: 7f042aaa am: 55cafb55 am: 6de165ea am: f38c921d am: c15201da Change-Id: I47f109f9348051b9fcec06ae4fee74d606c2d020