Correct the lockscreen carrier text case

The carrier text is no longer set to all caps in AOSP

Change-Id: I6a28a2d54a3b748f418af9f867b8be562911ef59
SystemUI : Fix clear app data crash in recents panel

Change-Id: I78d48fae2ba6ac9727d4997e24af8e4b134950ab
Forward port battery icon options [1/2]

Bring forward the various battery icon options.
Portrait, Landscape, Circle, Text.

Still retains new options for where to display battery percentage text.

Cleanup Settings.java

Change-Id: Icfc14d989eebde9014538291c24aa76d328df234

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