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

Change-Id: I43c39047261b6e57888ac12606188fba6019cf59