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

Change-Id: Ib35db79fe1b1c58794bcd8184954f7c2334cd908