Merge changes from topic "locksettings-aosp-first" into main am: 137235a2 am: 71814b35

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640



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