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

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



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