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

This reverts commit 69a0e9039cc55069ee30c84b14b7f4eb0ac9280e.