Merge tag 'android-5.1.0_r1' into AOSP_MERGE

Android 5.1.0 release 1

Conflicts:
	Android.mk
	core/java/android/app/AppOpsManager.java
	core/java/android/app/admin/IDevicePolicyManager.aidl
	core/java/android/bluetooth/IBluetooth.aidl
	core/java/android/bluetooth/IBluetoothManager.aidl
	core/java/android/content/ContentProvider.java
	core/java/android/content/pm/PackageUserState.java
	core/java/android/net/NetworkIdentity.java
	core/java/android/provider/MediaStore.java
	core/java/android/provider/Settings.java
	core/java/android/view/ViewRootImpl.java
	core/java/android/view/WindowManager.java
	core/java/android/view/accessibility/AccessibilityManager.java
	core/java/android/widget/TimePickerSpinnerDelegate.java
	core/java/com/android/internal/os/ZygoteInit.java
	core/java/com/android/internal/widget/LockPatternUtils.java
	core/jni/android_hardware_Camera.cpp
	core/jni/android_hardware_SoundTrigger.cpp
	core/jni/android_view_Surface.cpp
	core/res/AndroidManifest.xml
	core/res/res/values-mcc204-mnc04/config.xml
	core/res/res/values-mcc310-mnc004/config.xml
	core/res/res/values-mcc310-mnc120/config.xml
	core/res/res/values-mcc311-mnc480/config.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values-zh-rHK/strings.xml
	core/res/res/values/bools.xml
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java
	graphics/java/android/graphics/drawable/InsetDrawable.java
	libs/hwui/OpenGLRenderer.cpp
	media/java/android/media/AudioManager.java
	media/java/android/media/AudioSystem.java
	media/java/android/media/IAudioService.aidl
	media/java/android/media/MediaFocusControl.java
	media/java/android/media/session/MediaSession.java
	packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
	packages/Keyguard/src/com/android/keyguard/CarrierText.java
	packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
	packages/SystemUI/res/layout/qs_panel.xml
	packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml
	packages/SystemUI/res/layout/recents_task_view.xml
	packages/SystemUI/res/layout/signal_cluster_view.xml
	packages/SystemUI/res/layout/system_icons.xml
	packages/SystemUI/res/layout/zen_mode_panel.xml
	packages/SystemUI/res/values-my-rMM/strings.xml
	packages/SystemUI/res/values-sw/strings.xml
	packages/SystemUI/res/values-zh-rCN/strings.xml
	packages/SystemUI/res/values-zh-rTW/strings.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
	packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
	packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
	packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
	packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
	packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
	packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java
	packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/core/java/com/android/server/AlarmManagerService.java
	services/core/java/com/android/server/BluetoothManagerService.java
	services/core/java/com/android/server/ConnectivityService.java
	services/core/java/com/android/server/InputMethodManagerService.java
	services/core/java/com/android/server/MmsServiceBroker.java
	services/core/java/com/android/server/NativeDaemonConnector.java
	services/core/java/com/android/server/SystemConfig.java
	services/core/java/com/android/server/TelephonyRegistry.java
	services/core/java/com/android/server/am/ProcessList.java
	services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
	services/core/java/com/android/server/location/GpsLocationProvider.java
	services/core/java/com/android/server/net/NetworkPolicyManagerService.java
	services/core/java/com/android/server/notification/ZenModeHelper.java
	services/core/java/com/android/server/pm/PackageManagerService.java
	services/core/java/com/android/server/pm/PackageSettingBase.java
	services/core/java/com/android/server/pm/Settings.java
	services/core/java/com/android/server/wm/AppWindowToken.java
	services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
	services/java/com/android/server/SystemServer.java
	telecomm/java/android/telecom/Conference.java
	telecomm/java/android/telecom/Connection.java
	telecomm/java/android/telecom/ConnectionService.java
	telecomm/java/android/telecom/ConnectionServiceAdapter.java
	telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
	telecomm/java/android/telecom/ParcelableConference.java
	telecomm/java/android/telecom/ParcelableConnection.java
	telecomm/java/android/telecom/PhoneAccount.java
	telecomm/java/android/telecom/PhoneCapabilities.java
	telecomm/java/android/telecom/RemoteConference.java
	telecomm/java/android/telecom/RemoteConnection.java
	telecomm/java/android/telecom/RemoteConnectionService.java
	telecomm/java/android/telecom/TelecomManager.java
	telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
	telephony/java/android/telephony/DisconnectCause.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/ims/ImsCallProfile.java
	telephony/java/com/android/ims/ImsReasonInfo.java
	telephony/java/com/android/ims/internal/IImsCallSession.aidl
	telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
	telephony/java/com/android/ims/internal/IImsConfig.aidl
	telephony/java/com/android/ims/internal/IImsService.aidl
	telephony/java/com/android/internal/telephony/DctConstants.java
	telephony/java/com/android/internal/telephony/ISms.aidl
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/IccCardConstants.java
	telephony/java/com/android/internal/telephony/PhoneConstants.java
	telephony/java/com/android/internal/telephony/RILConstants.java
	telephony/java/com/android/internal/telephony/TelephonyIntents.java
	test-runner/src/android/test/mock/MockPackageManager.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
	wifi/java/android/net/wifi/IWifiManager.aidl
	wifi/java/android/net/wifi/WifiConfiguration.java

Change-Id: I05279ce640dbe1877d0b8284a60639d871ed0581