Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a am: b42e50a3a0
am: fcaf2d1ae9

Change-Id: Ibb377673586caba3e9af9a5cdf8df8a21314d61b