Merge "Merge "Fixed a bug where the positioning on the lockscreen was wrong"...
Merge "Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a8223 am: ea2e5bfd" into nyc-mr1-dev-plus-aosp
am: 788d2c21
* commit '788d2c21':
Change-Id: I16178ec6349d2157fbd7a39e4ed33cc47424defe