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