Merge "Stop RcsService crash when CarrierConfig misbehaves" into oc-dev
tree: d5ca288c03da2faffb04e6113eb6f91eb5a66f87
  1. rcs/