Clean up Safe headset volume code [2/2]

Credits: CM

Change-Id: I0a7a30c38ed3da4af9d1c4796cad350970c992a0
Merge "Clean up Safe headset volume code [2/2]" into jb4.2