Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26': (396 commits)
  MediaActionSound: Fix video stop sound
  ZenModeHelper: fix cross deadlock with AudioService
  Ensure SurfaceView requests WM relayout when size changes.
  Camera: fix wrong FULL feature string
  Fix AudioService rotation helper thread
  Add anydpi to the providing-resources docs
  ZenModeHelper: fix cross deadlock with AudioService
  Import translations. DO NOT MERGE
  AudioService: alternative way of handling device rotation
  Send POWER_HINT_INTERACTION on rotate.
  Add minimum time for double tap gesture
  Import translations. DO NOT MERGE
  Camera2: Update video stabilization API doc.
  Relax auto-launch checks for GET_CONTENT.
  Ambient display now comes up immediately when a notification comes in
  Fix jank: Don't write lockout deadline if not needed
  Bump BatteryStats version
  Fix jank: Don't write lockout deadline if not needed
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
  Bump BatteryStats version
  ...

Conflicts:
	core/java/android/accounts/AccountManager.java
	core/java/android/nfc/cardemulation/AidGroup.java
	core/java/android/os/storage/IMountService.java
	core/java/com/android/internal/widget/ILockSettings.aidl
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
	services/core/java/com/android/server/LocationManagerService.java
	telecomm/java/android/telecom/Phone.java
	telephony/java/android/telephony/CarrierConfigManager.java
	telephony/java/android/telephony/RadioAccessFamily.java
	telephony/java/android/telephony/ServiceState.java
	telephony/java/android/telephony/SignalStrength.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/ImsSuppServiceNotification.aidl
	telephony/java/com/android/ims/ImsSuppServiceNotification.java
	telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I28b74b38b338800a3bc8054999f95307ae66b505