Merge tag 'android-7.1.1_r4' of https://android.googlesource.com/platform/packages/providers/TelephonyProvider into n7.1

Android 7.1.1 release 4