Merge "[AudioPolicyManager] Fix mute/unmute while use DevicePortGain" am: fc11cf146c am: 17a72c3f55

Change-Id: I0eb4a47d468c013d71ce68abbd995543afb6bb64