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

[automerger skipped] Merge changes from topic "locksettings-aosp" into main am: 7df13d67 am: 7fcb018b am: 40832590 am: efc42901 am: 783078ae -s ours

am skip reason: Merged-In Idc5ff9171d3f40676183c2f5460886adff288f09 with SHA-1 18346d8f is already in history

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



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