Revert "Volume robustification and noDelayInA2DP"

This reverts commit e7bbd2cbca9b41ed68a3cc34320536ec78349e5d.