Merge tag 'android-10.0.0_r31' of https://android.googlesource.com/platform//packages/services/Telecomm into q

Android 10.0.0 release 31

Change-Id: Ie2846be2dc9ea43afe575d5e66fdc3d666aa9fd2