Change to show generic lock screen before setup fingerprint or face

Bug: 121235656
Test: atest
Change-Id: Ib2a4c7382334433a56225f5338896f70b752071d
4 files changed