am adf760b9: am fba67941: am 0eb5a270: Merge "audio policy: fix transition from VoIP to voice call on USB" into mnc-dr-dev

* commit 'adf760b98f22597bd0133c67af40d983a3e014c6':
  audio policy: fix transition from VoIP to voice call on USB