Merge changes from topic "locksettings-aosp" into main am: 7df13d67 am:...

Merge changes from topic "locksettings-aosp" into main am: 7df13d67 am: 7fcb018b am: 40832590 am: efc42901

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



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