[automerger skipped] Merge "Removed unused methods" am: f36b2d32 am:...

[automerger skipped] Merge "Removed unused methods" am: f36b2d32 am: dad5fa3b am: 46864bb5 -s ours am: 67bcaf58 -s ours

am skip reason: Merged-In I03752b7ccae39290814f894007ebe9e3d32c083e with SHA-1 228b7ea7 is already in history

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



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