MIUI Style carrier text in the statusbar [2/2]

Change-Id: I932b999a4f6d072c6e4125471886d974c5d41ffb
Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec
(cherry picked from commit 02fb6137c46a02864d4bb804df80fc56a6e28e48)
Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1