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