Merge "[Notif] Show block message for notif with multiple channels" into pi-dev
am: a4dab5d1ea

Change-Id: Ia63bb40d82092673247304586abbbfc340d446c6