Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev am: e287bbe82b am: b04079323c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19264894

Change-Id: I4dc805debfba57519840225456c8143fdf532232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>