SystemUI: Update no SIM status bar icon

* Correctly sized this time

Change-Id: Ifbe780e44001157e9453f08cb8301b8717558481
Add back increasing ring feature (1/3)

Change-Id: I76c22ea94f25c576972361ad0ab209accb8ae1de

Conflicts:
	core/java/android/provider/Settings.java
display: Don't enable keyboard lights when dozing

Change-Id: Ifd2e490da0af564315aa3c07002cb045377b78cd

Conflicts:
	services/core/java/com/android/server/display/DisplayPowerController.java
ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Be sure to shutdown the proximity sensor after display wake

This fixes:
http://review.cyanogenmod.org/#/c/66657/

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab

PowerManager : Make proximity check opt-in

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8

Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/res/res/values/symbols.xml
	services/core/java/com/android/server/power/PowerManagerService.java