Fixes: 112577631 This reverts commit a3a4744e. Reason for revert: volume dialog won't dismiss with A2DP headset Change-Id: Ib99d344ce5c5afbf8e11b90f329959cffbf209a5