[automerger skipped] IMS RCS API Improvements-DelegateRegistrationState am: b6518929e6 am: 90cd156539 am: d8a8913168 am: 0c77ca039c -s ours

am skip reason: Merged-In Icfa7fd363ad4f9ad0131d78602c264742cd1785f with SHA-1 e3f7649646 is already in history

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

Change-Id: I08b6e803bcf65a9b7f772062618b8b49abdef7c6