Revert "Revert "Overlay new bluetooth settings into SetupWizard.""

This reverts commit eab933ebcc442f2e3ef02a4545b29bbcb488e84a.

Change-Id: I3012a5ce27008a5ac3cbc4bf0878fb5b83542dd2
5 files changed