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

* commit '846b8822c07e844626c928475798cb004feaae6a':
  MediaBrowserCompat: Call onChildrenLoaded properly
  MediaBrowserServiceCompat: Implement MediaBrowserServiceApi23

Change-Id: If20b684ccb72aa5cbadf50a0554686344e006c7d