am 18037797: Merge "Ensure NotificationCompat.MediaStyle methods return MediaStyle" into lmp-mr1-ub-dev

* commit '18037797371e1f7e10f63ecdca53888645441208':
  Ensure NotificationCompat.MediaStyle methods return MediaStyle