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

Change-Id: I570a3946f1afcc8398c4bc689b443997056a571f