[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-132ab15618d949a4a59ff2cd6736e1b2" into sc-v2-dev-plus-aosp am: d95d553c am: 05a6bafb am: 93f91d71 -s ours

am skip reason: Merged-In Iee219a43d70aca80e5a87b5c22305fbc57768654 with SHA-1 7af5fbbc is already in history

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

Change-Id: I15a99ecfa50cb2dbff7a35a009ae359c1e9a15db