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

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