Merge "Misc fixes to CtsVerifier keyguard test"