Show plugged type (AC / USB) on QS battery tile

Conflicts:
	packages/SystemUI/res/values/custom_strings.xml
	packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java

Change-Id: I2219a2f771cc5907b3853fb8108df6ce9833433f
Merge "Show plugged type (AC / USB) on QS battery tile" into kitkat3