am 7c9ed471: Merge changes I1fd178b6,I5093672e into lmp-preview-dev

* commit '7c9ed471c6f5e7d21b49be1105c973d3a8473d59':
  DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
  media.MediaCodec: document and fix-up setNotificationCallback