am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio policy: fix output device command after clearing audio patch"

* commit '1ed13b3b443735e7f7b5002954f31741b0b1c572':
  DO NOT MERGE - audio policy: fix output device command after clearing audio patch