[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: b4c7a195 -s ours am: 538db1eb -s ours am: 9339767c -s ours

am skip reason: Change-Id I7b44870ff8cd4dd80dfa26f429e99320080045ad with SHA-1 ed1825d0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/12804413

Change-Id: I2daae08c784c15fb574fb3c0311888f4d8802ba2