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

Android 7.1.2 Release 5 (N2G47J)

Change-Id: Ibf121855e4ffebbf8188b52ae13e5b00c5e7ce9a
41 files changed