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

Android 6.0.1 release 3
4 files changed