Merge "[RCS UCE] Fix  build failed in Telephony because of the ImsService API changes" am: 5f5037c503 am: a3303706fa am: 8e5eaf5439 am: 06d5bae884 am: c9eea55c0c

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

Change-Id: I799a2a289fd67cbaf1095b6302ac5b3252e7fc31