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

* commit '81eb778add9ecf72e6ac422400660ed785b74faf':
  MediaBrowserCompat: Call onChildrenLoaded properly
  MediaBrowserServiceCompat: Implement MediaBrowserServiceApi23

Change-Id: I4c98d01663d63c065c5e6a9f37b75ef2a1cd52ee