Frameworks: Forward Port Circle Battery and Landscape Battery (2/2)

removed Slims battery options

Thanks to:
@Sven-Dawitz
@jruesga
@mikeNG
QS: Make it possible to show smaller icons (1/2)

* Remove text and show more icons on one row

Change-Id: Ie247aba1ae5fbdb8f5298e30fb2f04a985e73532

Conflicts:

	core/java/android/provider/Settings.java