Merge changes I1379b959,Iaf1e1bff into nyc-dev

* changes:
  MediaBrowserCompat: Call onChildrenLoaded properly
  MediaBrowserServiceCompat: Implement MediaBrowserServiceApi23