[automerger skipped] Merge "ShadowLockPatternUtils: remove patternEverChosen...

[automerger skipped] Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378 am: 12c10132 am: c44a165e am: 15c5cd24 -s ours am: e249035b -s ours

am skip reason: Merged-In If196bbef4755c644b3188043ed47e99817bf1856 with SHA-1 938902d2 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713



Change-Id: Ic3b58db092ca05b3a0bf27d5e5ea9901b1b16215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>