Merge "AudioService: validate uid / package name match"