Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb
am: 48e63162ef
am: 099ec4b930
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955 Change-Id: I5bc03a03ac0f58208b384332bde10f8cb15792ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: