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