Merge changes from topic "sub_cleanup" into main am: 3b6346b4

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



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