Merge "Adjusts the gain control in audio_policy_configuration" into pi-dev
am: b664d76690

Change-Id: I4108df88e8c3625ae9c78a86a31c45ff14e8b3dd