Merge commit 'acb1def7' into 121

Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/wifi_advanced_settings.xml
	src/com/android/settings/ApnSettings.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/applications/ManageApplications.java
	src/com/android/settings/sim/SimSettings.java

Change-Id: Id009fcc8367f25b05c3aebda26ff16df7b03d2ed