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

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

Change-Id: I5d3673c35691dc39f8e48ad81e04e432840620f8