Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
am: 42621023cf

* commit '42621023cfac084b8c74fd4d362bc2c64d61674e':
  Fixes a few bugs on the keyguard with font density changes

Change-Id: Ia5ab8a7269eb3bfcb88bdfc98926bdbd0bff0af8