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