Merge "Revert "Revert "Convert Keyguard tests to Robolectric tests""" into tm-qpr-dev