Merge "Throw IllegalStateException in MediaBrowserCompat.search()" into nyc-support-25.4-dev