Merge tag 'android-7.0.0_r14' of https://android.googlesource.com/platform/packages/providers/TelephonyProvider into HEAD

Android 7.0.0 Release 14 (NBD90Z)