Revert "Add setting for Vold Switchable Pair"

This reverts commit d4664266551a184c537a2d53758de3c2877f62c3.
Revert "Revert "Add setting for Vold Switchable Pair""

This reverts commit d365b4cefdf856781e15971b561053cf98f7eb60.