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

Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0ace am: 3eb12fab am: 81afb5c0

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



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