Merge "MediaBrowserServiceCompat: Provide a way to retrieve root hints" into nyc-dev