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