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

Change-Id: I6d850adc0599a364ab23a182fcd86d29da592012