Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983
am: 8aae584706
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930 Change-Id: Ia56e0688dc54abd45a8f596a50b463ebaf33a707 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: