Merge "audio policy: fix loss of audio patch client UID"