Merge "Prevent MediaBrowser.mRootHints from being modified in API 21+" into nyc-support-25.4-dev