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

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

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



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