Merge changes from topic "locksettings-aosp-first" into main am: 852ee8e4...

Merge changes from topic "locksettings-aosp-first" into main am: 852ee8e4 am: 0936166e am: 88bacd76 am: 5d5682d7

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



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