Fix phishing attack in ChooseLockGeneric

Cherry-pick of 436256c36d69549c77320d073bef27649c1b1d6e

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1

diff --cc tests/app/Android.mk
index 381006a,2df9525..c0c0ccf
--- 1/tests/app/Android.mk
--- 2/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@@ -14,7 -15,7 +14,8 @@@ LOCAL_STATIC_JAVA_LIBRARIES := 
      espresso-contrib-nodep \
      espresso-intents-nodep \
      ub-uiautomator \
 -    truth-prebuilt
++    truth-prebuilt \
 +    legacy-android-test
  
  # Include all test java files.
  LOCAL_SRC_FILES := $(call all-java-files-under, src)