Merge changes I1379b959,Iaf1e1bff into nyc-dev
am: 2b8771c79b

* commit '2b8771c79bf903b23538f02afaa7be44f4079e97':
  MediaBrowserCompat: Call onChildrenLoaded properly
  MediaBrowserServiceCompat: Implement MediaBrowserServiceApi23

Change-Id: I200e0fd58ce5e44013646a1a71b6c0fba3498c01