Merge tag 'android-4.3_r3' of https://android.googlesource.com/platform/frameworks/opt/telephony into HEAD

Android 4.3 release 3.0

Change-Id: I67e1ae2436fd5a1cc9f1ca8bbc0c4e711e5a4f0c
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/frameworks/opt/telephony into aosp-plus_4.3

Android 4.3 Release 3.1

Change-Id: I79e0d6206dd4cf95f7574240b9bb0b47eae9cda0