Merge "Restructure CarrierMessagingServiceWrapper with better interfaces." am: 7e5f02b7d4 am: 5ce0715b6a

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

Change-Id: Ic938275cf53320118ea7f2aaa73678dc705489bf