Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d
am: eb4fa99d5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796 Change-Id: I950af7978c4af50afbcde4d59395780973762764 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: