Merge "Fix missing KeyguardStatusView after cancelling fps login" into tm-qpr-dev am: 196dc4a6

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



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