Make the "hidden battery" still appear in QS

While the hidden battery indicator mode implemented in the Settings
application should only hide the indicator in the status bar, it also
happens to hide it inside the QS tile for the battery which in turn
leaves an ugly UI. This commit provides a workaround by specifying
in which cases the indicator is being used for QS and providing a
special case for that.

Change-Id: Iede5dedfc90343d5b9f768aefc4a53b2aa56a1da
Merge "Make the "hidden battery" still appear in QS" into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat