Bring back "Align Settings Button to right"

Change-Id: I44ae6f132b0de438704f66145c4d2c68d54ee0c8
Initial try to get custom carrier label on lockscreen too :\

Change-Id: Ia0d9b8be2a0df59d29bc178e7667c7d67c1ad0ee