am 09a1f34f: (-s ours) Merge "DO NOT MERGE - audio policy: fix inifinite loop in clearAudioPatches()"

* commit '09a1f34f2f45fe01b7dc6a15b15259ba61e47b5b':
  DO NOT MERGE - audio policy: fix inifinite loop in clearAudioPatches()