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

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

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