Merge "Merge "Fixes a few bugs on the keyguard with font density changes" into...
Merge "Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023 am: 4f2264ed" into nyc-mr1-dev-plus-aosp
am: db369d54
* commit 'db369d54':
Change-Id: I9903b82a663d3ed2bb4b5e9ee7d781e1b68a60b0