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