Merge "Deprecate android.net.rtp/android.net.sip." am: 7a4416dc94 am: 2a5f631c28

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1539847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09dfa2bb0187f0e76e8bc3eb60587b35fd7e1cf0