[automerger skipped] Merge changes from topic "sub_cleanup" into main am:...

[automerger skipped] Merge changes from topic "sub_cleanup" into main am: 3b6346b4 am: 320268b3 -s ours

am skip reason: Merged-In Ie68cc64241516852044bd7ea7afcdbff5b4a315f with SHA-1 3e2a3476 is already in history

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



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