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

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

Change-Id: I31fa4753a23bf950abc29063ba493c9819dddaef