Merge "Mark android.net.sip code as deprecated." am: 3b36aa32fa am: 346a19a3ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabfc90911c149ce44e6c9133abf320b1a2809372