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: 21a1c50d am: 1e30c47c

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

Change-Id: If88fe2cbbc6b2a0b5ff8a0d08da4e04033157ae0