[automerger skipped] Merge "Remove the deprecated SipDelegate methods...

[automerger skipped] Merge "Remove the deprecated SipDelegate methods pertaining to Dialogs" into sc-dev am: df366773 -s ours am: 1a8ff136 -s ours am: a8275f45 -s ours

am skip reason: Merged-In I2675d3bd15199c75d70560b7ba529f267ac08970 with SHA-1 a0dcca7c is already in history

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

Change-Id: I39ef2380f1bfd11f114f5623179ddc7f1bdaf7cd