Merge "Merge "Don't show badge for media style notifications" into rvc-dev am:...

Merge "Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1 am: 58c69f01" into rvc-d1-dev-plus-aosp am: d0c84347

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

Change-Id: Icd60467f93b3eae4a692cc446afd9d0b6512414a