[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master...

[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 483bae79 -s ours

am skip reason: Change-Id If05c68cda1cc737cf32cce267c968880f1e7e1e1 with SHA-1 1fbf0eb1 is in history

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

Change-Id: I8c3891a19e7a4ae42352c9c40460601424284d1a