Merge "Make MediaSessionCompat/MediaControllerCompat work pre 21" into lmp-mr1-dev