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

* commit 'db369d54260da8251d0f8b929454df1fb8f316d4':

Change-Id: I9903b82a663d3ed2bb4b5e9ee7d781e1b68a60b0