[automerger skipped] Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
am: c44a165ec7
am: 15c5cd2478
-s ours
am skip reason: Merged-In If196bbef4755c644b3188043ed47e99817bf1856 with SHA-1 938902d2df
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: I71396e731f92073d32644f991cc5deaa6e1dc8e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: