(2/2) Lockscreen battery status!

Conflicts:
	res/xml/system_settings.xml

Change-Id: I888327d68be1492543a4e1705c8e127d86ba6172
[2/2] Settings: configurable rotation

Base: https://gerrit.omnirom.org/#/c/4526/

PS10
unifiy defaults

Change-Id: Ib0da7bfdf374eafeef24fb0b7c90464458d531b3

Conflicts:
	res/values/simpleaosp_strings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values/ras_strings.xml
	src/com/android/settings/DisplaySettings.java