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