[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

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

Change-Id: Icf6c8a7fef63bba2474f94822d4d31c2a4e3f677