[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-83cd5c976d904fc4883c5b3f3900f7ad" into sc-v2-dev-plus-aosp am: 09f791db -s ours

am skip reason: Merged-In I6cdd85a7e64b21bbf146b3d449b029c8604290d8 with SHA-1 6bd310f6 is already in history

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

Change-Id: Ieaf8aa026f1515c74e2e2faacb4fb87e9fc88ffc