[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 76fd224d -s ours am: 3d652f7e -s ours am: 98e2d668 -s ours

am skip reason: Change-Id Ia1e355445c6342ba31a7d936cd649915115446f9 with SHA-1 0fbc3c11 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/12579509

Change-Id: Ic568157bc893d6dfb8e5cf2e3aa80259d1ef8f2d