Merge "Add ImsStateCallbackController" am: 191552ddcc am: 2ee2461364

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1893316

Change-Id: I543d5da865b92dd09ac2a28b48816ff5fc43072b