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

[automerger skipped] Merge changes from topic "locksettings-aosp-first" into main am: 852ee8e4 am: 0936166e am: 88bacd76 am: 5d5682d7 am: 41ca057a -s ours

am skip reason: Merged-In Ic8d0134bc4f3e0979bf500ffb5a99f2522251d39 with SHA-1 b60583c3 is already in history

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



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