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

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



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