tree c7bdb58ce7a670c45a49d70cd2a6aff22c145427
parent d465078693e9f298b78a6ee4f59d5929cc6a698a
parent a3303706fa60b6b2f6869d68c6cae773c5ec5041
author James Lin <jamescflin@google.com> 1604373685 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604373685 +0000

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