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

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

Change-Id: I039e4ef07cb5f846ef33634bc3721651d00cf17b