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

Change-Id: If07541a0bc11a61312e2640c16aa4896deab353d