[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: ac820f28 -s ours am: 500964a7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibeccd3ae4d8bb325072b08ee72af3a50e6331553