[1/2] SystemUI: options to show/hide carrier label and battery percent on lock screen

Signed-off-by: errantzebra845 <errantzebra845@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

 Author:    Altaf-Mahdi <altaf.mahdi@gmail.com>
Merge branch 'c5' of https://github.com/CandyRoms/frameworks_base into c5

Signed-off-by: errantzebra845 <errantzebra845@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java