Merge "Revert^2 "Add (virtual) device ID to AudioPolicy/AudioMix"" into main