Merge commit 'b5375056' into AOSP_MERGE_NMF26O

Conflicts:
	cmds/bootanimation/Android.mk
	cmds/bootanimation/BootAnimation.cpp
	cmds/idmap/scan.cpp
	core/java/android/app/DownloadManager.java
	core/java/android/bluetooth/BluetoothHeadset.java
	core/java/android/provider/Settings.java
	core/java/android/widget/PopupWindow.java
	core/jni/android_hardware_Camera.cpp
	core/jni/android_media_AudioFormat.h
	core/jni/fd_utils-inl.h
	core/res/AndroidManifest.xml
	core/res/res/values-ar/strings.xml
	core/res/res/values-bn-rBD/strings.xml
	core/res/res/values-de/strings.xml
	core/res/res/values-es-rUS/strings.xml
	core/res/res/values-es/strings.xml
	core/res/res/values-fa/strings.xml
	core/res/res/values-fr/strings.xml
	core/res/res/values-gu-rIN/strings.xml
	core/res/res/values-hi/strings.xml
	core/res/res/values-in/strings.xml
	core/res/res/values-it/strings.xml
	core/res/res/values-km-rKH/strings.xml
	core/res/res/values-kn-rIN/strings.xml
	core/res/res/values-ko/strings.xml
	core/res/res/values-lo-rLA/strings.xml
	core/res/res/values-ml-rIN/strings.xml
	core/res/res/values-mr-rIN/strings.xml
	core/res/res/values-my-rMM/strings.xml
	core/res/res/values-pa-rIN/strings.xml
	core/res/res/values-pl/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-ro/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-sk/strings.xml
	core/res/res/values-sl/strings.xml
	core/res/res/values-sr/strings.xml
	core/res/res/values-sw/strings.xml
	core/res/res/values-ta-rIN/strings.xml
	core/res/res/values-te-rIN/strings.xml
	core/res/res/values-th/strings.xml
	core/res/res/values-tl/strings.xml
	core/res/res/values-tr/strings.xml
	core/res/res/values-uk/strings.xml
	core/res/res/values-ur-rPK/strings.xml
	core/res/res/values-vi/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values-zh-rHK/strings.xml
	core/res/res/values-zh-rTW/strings.xml
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	media/java/android/media/MediaFile.java
	media/java/android/media/SoundPool.java
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
	packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
	packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml
	packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml
	packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g_plus.xml
	packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte_plus.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
	services/core/java/com/android/server/AlarmManagerService.java
	services/core/java/com/android/server/ConnectivityService.java
	services/core/java/com/android/server/LockSettingsService.java
	services/core/java/com/android/server/NetworkManagementService.java
	services/core/java/com/android/server/connectivity/Tethering.java
	services/core/java/com/android/server/display/LocalDisplayAdapter.java
	services/core/java/com/android/server/location/GpsXtraDownloader.java
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/core/java/com/android/server/notification/ScheduleConditionProvider.java
	services/core/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/SystemServer.java
	telecomm/java/android/telecom/Conference.java
	telephony/java/android/telephony/CarrierConfigManager.java
	telephony/java/android/telephony/DisconnectCause.java
	telephony/java/android/telephony/RadioAccessFamily.java
	telephony/java/android/telephony/ServiceState.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I1791555fc835fe7f725012b295b9817f693e379f