Merge tag 'android-11.0.0_r38' of https://android.googlesource.com/platform//packages/services/Telecomm into r

Android 11.0.0 Release 38 (RQ3A.210605.005)

Change-Id: I34696fcd83875480f37af7fe08fcea439633a99b