Merge "MediaSessionCompat: Check extra binder is ready only on API 21+" into nyc-support-25.3-dev