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

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

Change-Id: I6d7f94fdb0a7d123d7c9ef80276cb6f9efa81977