Merge "Set extra EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE for SIP accounts." into oc-dr1-dev
am: 278a9368a3

Change-Id: Idb684dbbe17d63f1cd365aa269699261cd814244