Settings App: Fix to resolve NULL pointer exceptions

This fix resolves any NULL pointer exceptions and
Array Index Out of Bounds exceptions seen in
Settings Application code space.

CRs-Fixed: 760115
Change-Id: I8c2b7b8e19d362a5c5789d8693bcd3656c32e38d
Revert "Battery text mode (2/2)"

This reverts commit 312807e1b99284315c0e236250d6e5928534905f.

Conflicts:
	res/values/nexus_arrays.xml
	res/values/nexus_strings.xml
[1/2] Settings: Add options for battery icon in status bar.

Change-Id: I29e4e6c2d839da7184fd867951b13c2cfbecbe7e