[automerger skipped] Merge "DO NOT MERGE" into qt-dev am: 6cdc442d am:...

[automerger skipped] Merge "DO NOT MERGE" into qt-dev am: 6cdc442d am: 0d738ba6 -s ours am: 3df0c865 am: 3b9cd0bd -s ours am: bf60c188

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

Change-Id: Ic45e7f8da8cbc1942ce7c120d1cdd151365d461b