Merge "Convert Keyguard tests to Robolectric tests" into tm-qpr-dev am: 62a7561e am: ebb40513

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



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