Merge "Merge "Include notif suppression in canShowBadge" into rvc-dev am: 3314f72c am: daa251b0" into rvc-d1-dev-plus-aosp