Merge "Set volume for output when effect is enabled/disabled." am: e778547997 am: e414f58cf5
am: 97f00044dc

Change-Id: I5430650ffe90b7f4f38ba97d85df91a2262420c7