Merge "Fixes a few bugs on the keyguard with font density changes" into...
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023 am: 7b7b17ab
am: d1c82578
* commit 'd1c82578':
Fixes a few bugs on the keyguard with font density changes
Change-Id: I31fa4753a23bf950abc29063ba493c9819dddaef