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

[automerger skipped] Merge changes from topic "locksettings-aosp-5" into main am: ec6110bf am: 8ce12251 -s ours am: e7684009 -s ours

am skip reason: Merged-In If1a3ac06b2c02b273afa47e6b0a90bf08408fb6b with SHA-1 9ff12f33 is already in history

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



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