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

Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1 am: 2e075cfb am: ec6787c1

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

Change-Id: I4c64507ffa76f3d0dd1c23ec8e0bf1628aa5d88d