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: 2e075cfb am: ec6787c1" into rvc-qpr-dev-plus-aosp am: f9c4d2df

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

Change-Id: I2291d6731c39ff2cbc2cc6532f25329344ce40f0