Revert "Add setting for Vold Switchable Pair"

This reverts commit 53f0d71c3f530555fcba637db6eb001ef996dfe4.