Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/packages/providers/TelephonyProvider into cm-10.2

Android 4.3 Release 3.1

Change-Id: Ia873be5c3e6e8cb283fade1fd4566e99658be0c7