Merge changes I1fd178b6,I5093672e into lmp-preview-dev

* changes:
  DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
  media.MediaCodec: document and fix-up setNotificationCallback