Merge "Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a am: dacd9ed196" into oc-dr1-dev-plus-aosp