Fixed
 Mobile Network Battery Saver Mode now set to 20s

When idle (screen off) switching to  2G can help extend battery life as 2G generally uses less power than 3G or LTE. + 20 seconds after screen turns off, set network type to 2G + If a music player is active (playing), do not set network to 2G + When device is unlocked, reset to orignial network type Settings -> More -> Mobile Networks -> Battery saving mode
Merge branch 'kitkat' of https://github.com/XPerience-AOSP/android_packages_services_telephony into kitkat

Conflicts:
	src/com/android/phone/BatterySaverManager.java
	src/com/android/phone/MobileNetworkSettings.java