Merge "Hide "Volume adjustment sound" option on non-voice capable devices" into cm-11.0
(cherry picked from commit 26ff27356af0b2e0e57d12e802a0e734ad514ec3)