Merge "DO NOT MERGE - audio policy: fix inifinite loop in clearAudioPatches()"