Merge "Enable feature flag for audio output switcher." into pi-dev am: 116e05cbba
am: fc01e133b5

Change-Id: I512891cb258131cd1b6174e60936f707f6a875a6