[2/2] Settings: Add lockscreen ring battery setting
Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18
Merge "Settings: Only disable menu unlock options with custom keyguard" into cm-11.0
Settings: lock screen grammar fix

Change-Id: Ic6bd08ea80e6cd8970c5cb5e36e715811953d12d
MSIM: Hide latest area info broadcast if not brazilian sim

Change-Id: I6beafb788ea66c6e97ca0545380f1ea296841c1f
MSIM: Ui fixes, replace Subscriptions with real operator names

Add Sim slot number after Operator name and check
for SIM_STATE_ABSENT and display No SIM instead of NULL

Change-Id: I2a340487fcb01dde1a50f5a45c71cd61711380c3