Merge "MediaBrowserServiceCompat: Add more explanation on getBrowserRootHints()" into nyc-dev