Merge "Revert^2 "Reapply "AudioFlinger: Control volume using Port ID""" into main