Merge "Consolidate face enroll intro/consent screens" into sc-dev am: 5ed928f626
am: 426fded7ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14510896 Change-Id: I72239463e0d11430d70774dbfc2aac7d27484ff1
This commit is contained in: