Merge "Mark android.net.sip code as deprecated."