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

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

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