Merge "Modified fingerprint enroll test" into udc-dev am: c75baeb7

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



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