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

Change-Id: Id7144fbbf59ca9efeee0f20aa1a988377c87747a