Merge "Remove unnecessary if in MediaSessionService#dispatchAdjustVolumeLocked" into main