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