Merge "NotificationCompat: Add extras of Notification for MediaStyle" into nyc-support-24.1-dev
am: 2c8a794a72

Change-Id: I7b6edfeb2d4828f5a840848a0cedb2bfc3790861