Merge "Merge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev am: db5beef4cf am: 8e3c14dfdc" into oc-mr1-dev-plus-aosp