am 81e6a2e0: (-s ours) am 77514217: am e912bfd7: audio policy: direct output fix - DO NOT MERGE

* commit '81e6a2e099546f4580253d2b0262d43f2a4090aa':
  audio policy: direct output fix - DO NOT MERGE