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

Change-Id: I421260233901525a17c4f3aa0ea1b10485f09852