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

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I7800fe68e64eb978b4bb4e4cb3828c1ebc918fa9