Merge "NotificationMediaManager now requires modern media notifications" into sc-v2-dev am: 5056199bd2

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

Change-Id: I640322386a387b714a36f930068a9351f818ba36