Revert "Overlay new bluetooth settings into SetupWizard."

This reverts commit d6610ff0ddf1d2901e1c90dcbe73acaf2e9b07f0.

Change-Id: Ie5e2cda96933898d66f20ac3a528e7671329f762
5 files changed