Revert "Revert "Use SetupWizardPreferenceLayout""

This reverts commit 73512ee6842166bbf0b37d70983595911b87db2d.

With ag/866290, this change can be applied again.

Bug: 27152471
Change-Id: I0fd78218b989e99873765f7678f0113fb2c08f16
8 files changed