Merge "Fix keyguardStatusView disappearing when unlocking and locking the...

Merge "Fix keyguardStatusView disappearing when unlocking and locking the device very quickly" into udc-qpr-dev am: a59465bb am: 9a0b4802

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



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