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

Change-Id: I03aace9b4b0b6ceed6035ac674091d5d2de3a49b