[automerger skipped] Merge "Remove SipPhone." into sc-v2-dev-plus-aosp am:...

[automerger skipped] Merge "Remove SipPhone." into sc-v2-dev-plus-aosp am: 79941de4 -s ours am: 68098a11 -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: I1b5128c202850f0057dc501a4ec330ed499312ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>