[automerger skipped] Remove SipPhone. am: 9005687d -s ours am: 83ad7c66 -s...

[automerger skipped] Remove SipPhone. am: 9005687d -s ours am: 83ad7c66 -s ours am: e7e21393 -s ours am: 104d8c49 -s ours

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

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



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