Merge "Update deviceID for VirtualAudioDevice based on policy" into main