Merge "Revert "Revert "Convert Keyguard tests to Robolectric tests""" into tm-qpr-dev am: 698171c3ad

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

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