Merge tag 'android-4.3_r2.1' into jb-mr2

Android 4.3 release 2.1

Conflicts:
	res/values-el/strings.xml
	res/values-iw/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/config.xml
	res/values/strings.xml
	res/xml/network_setting.xml
	src/com/android/phone/CallFeaturesSetting.java
	src/com/android/phone/CallNotifier.java
	src/com/android/phone/MobileNetworkSettings.java
	src/com/android/phone/NotificationMgr.java
	src/com/android/phone/Use2GOnlyCheckBoxPreference.java

Change-Id: Iffe1bba52adb1135326ccea652c1ccd64696ba05

Conflicts:
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-el/strings.xml
	res/values-hu/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-pt/strings.xml
	res/values-sk/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/phone/CallFeaturesSetting.java
	src/com/android/phone/CallNotifier.java