Merge "MediaBrowserCompat: Provide compat API for MediaBrowser.search" into nyc-support-25.2-dev am: c3bc12d7de
am: 1c839e2576

Change-Id: Ib8dcf616d4e7abd47eb23b0a2d8ac70c3e870a4c