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

* commit '7b7b17ab804b81b9dac709012e2e40aa128430ec':
  Fixes a few bugs on the keyguard with font density changes

Change-Id: Ief94128ae895fdfadb4aab3ea1d03f12a4257d7f