Merge "Allow ImsService to return network error codes"
am: ba2cdfb222

Change-Id: I1bd120e8f799529f5cebee8489961eff5eb3342a