Merge "DO NOT MERGE - audio policy: fix output device command after clearing audio patch"