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 am: 52b567d1

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

Change-Id: I411862aa55b9583668c1d736ddaafe79ae4ec5f2