[automerger skipped] Merge "Add ImsStateCallbackController" am: 191552ddcc am: 2ee2461364 am: 49375577b0 am: 3456b362af -s ours

am skip reason: Merged-In I336761a7174bf35d72b6bd0e3040db58fef54daa with SHA-1 3b742d6d3b is already in history

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

Change-Id: I1a5a7b10f15c85da6badc601260422142355c75e