Merge "Merge "MediaBrowserServiceCompat: Add more explanation on getBrowserRootHints()" into nyc-dev am: 7eb4234059 am: 2b586c818a" into nyc-mr1-dev-plus-aosp