Merge "Fix ClassNotFoundException in MediaBrowserCompat.search" into nyc-support-25.4-dev