Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b am: 4e494148

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



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