[automerger skipped] Merge "Remove SipPhone." am: ef8028f9 -s ours am:...

[automerger skipped] Merge "Remove SipPhone." am: ef8028f9 -s ours am: 8a7e024e -s ours am: 73b4cd7a -s ours am: 31b1634d -s ours am: 2aa41892 -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: Ie019161ae7d75ab767bb11a2ad76e9e6401afbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>