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

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

Change-Id: I50b0addaa7dbb0e77cbe0a08b93e47e71c515386