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

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



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