Revert "Revert "Add setting for Vold Switchable Pair""

This reverts commit f5a2d77441c040781da55af2baf22a46343222eb.