Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_SetupWizard into leaf-3.2

Change-Id: I417c41774646001f09a184fe83bbc5e3350b19d9