[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 am: 0e692f16 -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: Icb1d35e1ca4a336a9b464b0201973eea5eec7344