Merge "Updating TrustManagerService to react to keyguard visible changes." into tm-dev