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

[automerger skipped] Merge changes from topic "locksettings-aosp-4" into main am: 5402a800 am: 694c0759 am: 3e50c9ea am: 6bb657cf am: aa26ef9e -s ours

am skip reason: Merged-In I6707b6f33b37f940aecbbd9ec82455fa2a205e99 with SHA-1 042cd5d9 is already in history

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



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