Merge tag 'android-5.1.0_r1' into AOSP_MERGE

Android 5.1.0 release 1

Conflicts:
	AndroidManifest.xml
	res/layout/manage_applications_content.xml
	res/layout/preset_picker_item.xml
	res/layout/wifi_assistant_card.xml
	res/values-ar/strings.xml
	res/values-bn-rBD/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-et-rEE/strings.xml
	res/values-eu-rES/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr-rCA/strings.xml
	res/values-fr/strings.xml
	res/values-gl-rES/strings.xml
	res/values-hi/strings.xml
	res/values-hr/strings.xml
	res/values-hy-rAM/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-ja/strings.xml
	res/values-ka-rGE/strings.xml
	res/values-kk-rKZ/strings.xml
	res/values-km-rKH/strings.xml
	res/values-kn-rIN/strings.xml
	res/values-ko/strings.xml
	res/values-ky-rKG/strings.xml
	res/values-lo-rLA/strings.xml
	res/values-lv/strings.xml
	res/values-ml-rIN/strings.xml
	res/values-ms-rMY/strings.xml
	res/values-my-rMM/strings.xml
	res/values-nb/strings.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-si-rLK/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-te-rIN/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-ur-rPK/strings.xml
	res/values-uz-rUZ/strings.xml
	res/values-zh-rCN/arrays.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/arrays.xml
	res/values/config.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	res/xml/accessibility_settings.xml
	res/xml/sim_settings.xml
	res/xml/wifi_advanced_settings.xml
	src/com/android/settings/ApnEditor.java
	src/com/android/settings/ApnSettings.java
	src/com/android/settings/CryptKeeper.java
	src/com/android/settings/DataUsageSummary.java
	src/com/android/settings/DateTimeSettings.java
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/IccLockSettings.java
	src/com/android/settings/MasterClear.java
	src/com/android/settings/MediaFormat.java
	src/com/android/settings/PrivacySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/TetherSettings.java
	src/com/android/settings/Utils.java
	src/com/android/settings/accessibility/AccessibilitySettings.java
	src/com/android/settings/applications/ManageApplications.java
	src/com/android/settings/bluetooth/BluetoothPairingDialog.java
	src/com/android/settings/deviceinfo/Status.java
	src/com/android/settings/location/LocationSettings.java
	src/com/android/settings/notification/NotificationSettings.java
	src/com/android/settings/sim/SimSettings.java
	src/com/android/settings/wifi/AdvancedWifiSettings.java
	src/com/android/settings/wifi/WifiApEnabler.java
	src/com/android/settings/wifi/WifiConfigController.java
	src/com/android/settings/wifi/WifiSettings.java

Change-Id: I44a19ad52c5e60756bdf8dca089a5d511e0b7bd8