Merge "Add EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE extrs to phone account" into oc-dr1-dev
am: 8a3620f2cc

Change-Id: I596bca78ad74baa195b57ef4b7d15084b6baf219