Merge "Add ImsStateCallback" am: b636aacf1d am: 267ee57f27

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

Change-Id: I54b90d5ecdd265279fca2503e5414fe0c31b2e54