Merge "audio policy: fix transition from VoIP to voice call on USB" into mnc-dr-dev