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

Android 10.0.0 Release 9 (QD1A.190821.011.C4)

Change-Id: If10ec4e10f220811ab4f1ed1782e46438ce6a139