Merge changes from topic "locksettings-aosp-4" into main am: 5402a800 am:...

Merge changes from topic "locksettings-aosp-4" into main am: 5402a800 am: 694c0759 am: 3e50c9ea am: 6bb657cf

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



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