[automerger skipped] Remove SipPhone. am: 6e6cccae -s ours am: 9ef706fb -s...

[automerger skipped] Remove SipPhone. am: 6e6cccae -s ours am: 9ef706fb -s ours am: f05b0e3e -s ours am: 3efde453 -s ours am: 5499fe32 -s ours

am skip reason: Merged-In Ie88dcd842d82273b6122fdc0687780c7456e8db7 with SHA-1 9005687d is already in history

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



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