[automerger skipped] Merge "Restructure CarrierMessagingServiceWrapper with better interfaces." am: 7e5f02b7d4 am: 5ce0715b6a am: bb32f20f67 -s ours am: 5792c47ae1 -s ours

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

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

Change-Id: I72cef64d6dd2c0f64af0ad78620012d378c7d922