[automerger skipped] Merge "Restructure CarrierMessagingServiceWrapper with...

[automerger skipped] Merge "Restructure CarrierMessagingServiceWrapper with better interfaces." into rvc-qpr-dev-plus-aosp am: 7d7e505b -s ours

am skip reason: Change-Id I2394de9acba507f024563305e3b8bcc09868ce47 with SHA-1 d6a776d5 is in history

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

Change-Id: I61dd6007d302d2e9fa6920d68547886d17b903e4