Merge "Refactor testDisableKeyguard_thenSettingCredential_reenablesKeyguard test to check Device secured/locked status after setting credentials instead of checking for the visibility of Keyguard." into android10-tests-dev