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

[automerger skipped] Merge changes from topic "remove_obsolete" into main am: ad691920 am: eac7ca67 -s ours

am skip reason: Merged-In Icf96e90da21544c1549b8a16fb9579ba0fcbf5d1 with SHA-1 e5033b77 is already in history

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



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