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

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

am skip reason: Change-Id I1760623543b929a51ce26dc7dcc5f8ebe7fd9732 with SHA-1 38d5e091 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029377

Change-Id: I8c20c7c71eb72ad82331655425af5cbf7f5cdca3