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

Change-Id: I758d95a87400fe4643cd6cdb2c776de1975336b9