Merge "Fix regression on voice call default volume" am: 905d2c24cc

Change-Id: Idba2e87ad64a23198f658c4ccf3102d350b4099b