Merge changes from topic "udfps_keyguard_view_controller_to_kotlin" into...

Merge changes from topic "udfps_keyguard_view_controller_to_kotlin" into tm-qpr-dev am: 18499353 am: b2994861

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



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