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

Change-Id: I1d8c66344e4d1e954f8769d6d7766292020e9c0b