Merge "Keyguard: Update clock size" into oc-dev
am: 6441e1064c

Change-Id: I56dae82a5fdefcd088bb0b8ec8eb3cd8a89f7bf7