Revert "SysUI: Use LocationController from status bar service for GPSTile."

This reverts commit 07c549e4abac14cbf9ef1153fd9e25765c087f9f.
Revert "Update the GPS tile to use the appropriate location modes"

This reverts commit debb17a1623074b184161401cc10bac5c52e25f8.

Conflicts:
	packages/SystemUI/res/drawable-hdpi/ic_qs_location_lowpower.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_location_lowpower.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_location_lowpower.png
	packages/SystemUI/res/drawable-xxhdpi/ic_qs_location_lowpower.png
	packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java
QS: let's welcome LocationTile to 4.4

Change-Id: I3a24c930addce388561f9c0767272c95db65f8d6
Frameworks Base: More fixes

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/notification/PeekLayout.java

Conflicts:
	core/java/com/android/internal/util/axxion/TaskUtils.java
	packages/SystemUI/res/values/axxion_strings.xml
	packages/SystemUI/src/com/android/systemui/batterysaver/BatterySaverService.java
	packages/SystemUI/src/com/android/systemui/batterysaver/NetworkModeChanger.java
Revert "[1/2] Base: Option to enable Notification Light when screen is on"

This reverts commit e3b44c0eb3442b21e3b7708447ac1676613b05fe.

Conflicts:
	services/java/com/android/server/NotificationManagerService.java

Conflicts:
	services/java/com/android/server/NotificationManagerService.java

Conflicts:
	services/java/com/android/server/NotificationManagerService.java