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

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