Merge changes from topic "locksettings-aosp-4" into main am: 5402a800

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



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