Merge changes Ia6fca5cb,I89de76a4 into main

* changes:
  audio policy: fix redundant call routing
  audio policy: add flag for call audio patch fixes