Merge "CTS Keyguard*Tests don't assume screenlock" into oc-dev