MediaBrowserCompat: Use support library implementation for API 24 and 25
am: 0f9cc64466

Change-Id: Ie90d26946c2022b89714debe02c9830c255ebf6f