Merge "Keyguard: Remove fancy colon" into oc-dr1-dev am: 55bc522d0d
am: efb7931967

Change-Id: I43f8b47377c98cc6676f5db3f59973fb076cd0f4