[automerger skipped] Merge "Allow device ImsService implementing RCS to use...

[automerger skipped] Merge "Allow device ImsService implementing RCS to use CarrierMessagingService" am: e7db0c6c am: 929f54f2 -s ours

am skip reason: Merged-In I1594450b83ea99bc8c3c0aa76a4ea49aedeb5665 with SHA-1 cbc2add8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1709533

Change-Id: I457308a6d12137d253309f6ca49eb216265566c5