[automerger skipped] Merge changes from topic "locksettings-aosp-3" into main...

[automerger skipped] Merge changes from topic "locksettings-aosp-3" into main am: cf7db52d am: 9621fefc am: 32f8eb66 am: c396cfaf am: 910b9b9e -s ours

am skip reason: Merged-In I9885c934be4f99cf556aa6fcfadb6f65faf30e52 with SHA-1 decb4ee3 is already in history

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



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