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

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

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