Merge "Don't manage keyguard on instant app tests." into tm-dev