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

[automerger skipped] Merge "Restructure CarrierMessagingServiceWrapper with better interfaces." am: 7e5f02b7 am: 5ce0715b am: bb32f20f -s ours am: 5792c47a -s ours

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

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

Change-Id: I72cef64d6dd2c0f64af0ad78620012d378c7d922