Merge "DO NOT MERGE: Remove MediaBrowserServiceImplApi24" into nyc-support-25.4-dev