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

Change-Id: Ifeac95fa06d0160abf2215b84321be4a8823e31b