Merge "Fixes crash in face enrollment during set up in work mode" into...

Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev am: 9cb05bc5 am: 0eaab46d

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



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