Display options: allow configuration of wake on plug behavior (1/2)

From http://review.cyanogenmod.org/#/c/47159/

Change-Id: I601b3ccf35198d5cbda9971c693637f254b8db5d

Conflicts:
	src/com/android/settings/DisplaySettings.java
[2/2] Settings: Optional statusbar battery icons

    * Circle battery and circle battery percent (from CM <Sven Dawitz>)
    * Battery bar percent from Google
    * Quicksetting battery tile reflects status icon (from SlimROM <kufikugel>)

    - Option appears under Settings -> Battery -> Status Icon (ActionBar)

Part 1: frameworks_base

Patch set 1: clean white spaces
Patch set 2: fix conflicts
Patch set 3: rebase + why do some weird actionbar menu?

Signed-off-by: Anu6is <curtis.mayers@gmail.com>

Change-Id: Iae497e495045ca68522ab0b5bd342e044d4000f3

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/xml/power_usage_summary.xml
	src/com/android/settings/fuelgauge/PowerUsageSummary.java