Merge tag 'android-5.1.0_r3' of...

Merge tag 'android-5.1.0_r3' of https://android.googlesource.com/platform/packages/services/Telecomm into HEAD

Android 5.1.0 release 3

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/values/colors.xml
	src/com/android/server/telecom/BluetoothPhoneService.java
	src/com/android/server/telecom/Call.java
	src/com/android/server/telecom/CallActivity.java
	src/com/android/server/telecom/CallAudioManager.java
	src/com/android/server/telecom/CallLogManager.java
	src/com/android/server/telecom/CallsManager.java
	src/com/android/server/telecom/CallsManagerListenerBase.java
	src/com/android/server/telecom/ConnectionServiceWrapper.java
	src/com/android/server/telecom/InCallController.java
	src/com/android/server/telecom/Log.java
	src/com/android/server/telecom/PhoneAccountRegistrar.java
	src/com/android/server/telecom/RespondViaSmsManager.java
	src/com/android/server/telecom/ServiceBinder.java
	src/com/android/server/telecom/TelecomGlobals.java
	src/com/android/server/telecom/TelecomService.java
	src/com/android/server/telecom/Timeouts.java
	tests/AndroidManifest.xml

Change-Id: Ie52bec05b1207c104300e044c13c466ae875bce2