Merge changes from topic "locksettings-aosp" into main am: 7df13d67

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



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