[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: c3d5aeac -s ours

am skip reason: subject contains skip directive

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

Change-Id: I575df2dde21a9c846950ab575ba3895ce1b11343