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

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

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