Merge changes from topic "remove_obsolete" into main am: ad691920

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



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