Merge changes from topic "locksettings-aosp-3" into main am: cf7db52d am:...

Merge changes from topic "locksettings-aosp-3" into main am: cf7db52d am: 9621fefc am: 32f8eb66 am: c396cfaf

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



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