Merge "MediaSessionCompat: Use extra binder for setPlaybackState() on API 22+" into nyc-support-25.3-dev
am: 45d3353a50

Change-Id: If0417292051fdf5eae66785cb5207c6baf5ef383