Merge "Merge "Add setupwizard personalisation state to Settings" into pi-dev...
Merge "Merge "Add setupwizard personalisation state to Settings" into pi-dev am: e9b60f2c" into pi-dev-plus-aosp
am: 84022530 -s ours
Change-Id: I20696da072d979debf30621801d3cc61b4f6cb2c