[automerger skipped] Remove SipPhone. am: b485987e -s ours am: 59676434 -s...

[automerger skipped] Remove SipPhone. am: b485987e -s ours am: 59676434 -s ours am: 79e092bd -s ours am: eb1b281a -s ours am: 514cedf2 -s ours

am skip reason: Merged-In Ie88dcd842d82273b6122fdc0687780c7456e8db7 with SHA-1 6e6cccae is already in history

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



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