Merge tag 'android-4.3_r2.1' into HEAD

Android 4.3 release 2.1

Conflicts:
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-hu/strings.xml
	res/values-ja/strings.xml
	res/values-sk/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: Id67ee7aa0e8d9fac172d4984160f3b0886a587fa

Conflicts:

	src/com/android/phone/CallNotifier.java
	src/com/android/phone/GsmUmtsOptions.java