Merge "Revert addition of a11y stream in VolumeDialogController"