[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047...

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: d975c93a -s ours am: 74dd11cc -s ours am: dcbce3f5 -s ours

am skip reason: Merged-In I32a3cc7113f9b19c001a102b865c28f4db3c338d with SHA-1 aa349627 is already in history

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



Change-Id: Icd61c8b6f9c4e0a1e384a0564ca1f2f91a2674a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>