Merge "Unlock non-secure users automatically (1/2)" into main am: 985c8dcf04 am: cd0bd24650

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781311

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