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

Change-Id: I52ccc5e33d18a400c6da45bc258912c8fed0b9d0