Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb am: 48e63162ef

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

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