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

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

Change-Id: Ie1c2376a1f800ade61238310078cdab379974d35