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

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