Merge "Include notif suppression in canShowBadge" into rvc-dev am: 3314f72c9e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727210

Change-Id: Ifc89501d71962623ef984b26ebaaa0662df2f18a