Merge commit 'android-4.2.2_r1' into Upgrade_branch

* commit 'android-4.2.2_r1': (46 commits)
  Distinguish adding an already present word / cancelling
  Call back to whom requested to add a word to the user dict
  Fix wifi compareTo
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Pass the locale code in the help url for help pages.
  Add latest area info broadcast to Settings status screen.
  Import translations. DO NOT MERGE
  Revised language for notification ringtone picker.
  Import translations. DO NOT MERGE
  Better layouts for security screen setups as part of b/7459863
  Push scrollbars to screen edges.
  Fix text alignment and simplify layouts.
  Disable USB debugging checkbox and backup password for secondary users
  Fix incorrectly inverted text color.
  Add string resource removed by previous commit.
  Use uniform font size for APNs and timezones. DO NOT MERGE.
  Avoid split action bar when it only has one item.  DO NOT MERGE.
  Import translations. DO NOT MERGE
  ...

Conflicts:
	AndroidManifest.xml

Change-Id: Ie5f97b83c85b0633345fdf472cad0a1390101df1

Conflicts:

	AndroidManifest.xml
	res/layout/account_sync_screen.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-hu/strings-extras.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ru/strings.xml
	res/values-uk/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/Settings.java