Merge "Fix KeyguardViewMediatorTest." into udc-qpr-dev am: 4a58ebcc am: b398943a

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



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