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

Change-Id: I0dc8379cd3e2b49ee83cef6eec091cc785e380ff