Merge "audio policy: fix HW A/V sync rerouting" into nyc-dev
am: a8d309d

* commit 'a8d309df2f603767c0f0ad9248aef47a5b6ed5b8':
  audio policy: fix HW A/V sync rerouting