Revert "Add setting for Vold Switchable Pair (2/2)"

This reverts commit 821f89033d8f44c64c654d8e5a4241790acc9aa8.