Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

Conflicts:
	src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
	src/com/android/server/telecom/CallIntentProcessor.java
	src/com/android/server/telecom/CallsManager.java
	src/com/android/server/telecom/components/UserCallIntentProcessor.java

Change-Id: I6282a22460bddf72fe1cd4b178d797c5f82f652e