Merge "MediaBrowserCompat: Use support library implementation for API 24 and 25" into nyc-support-25.2-dev am: f79e331383
am: 5cb3917809

Change-Id: I63e0b2566b56d50cfc4d9bc75b637c26f7705de5