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

Change-Id: I7782dbcce3336639123649cd9ad867d0d63f74f4