[automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours am: f99b22505b -s ours am: 09362ab430 -s ours
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665
Change-Id: Ie2b16d9aad7513a1ea002eb09ce65bb4488684ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: