Merge "MediaBrowserCompat: Add methods for custom action support" into nyc-support-25.4-dev