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

Change-Id: Iaf881872eac47ab8823ebb5ecd9287177bac05e3