Merge "Combine UDFPS enroll segments into a single circle" into sc-v2-dev am: e1d531787c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16200850

Change-Id: I0e1f370dad1d7a6806c986267a664b7b57c77e39