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

Android 9.0.0 release 42

Change-Id: I593c6ef9d6a4890c08d77dcc3a9692fd4409bd41