[automerger skipped] Merge "Allow ImsService to return network error codes" am: ba2cdfb222 am: 626b8b066c am: 23a93d392e
am: 09494fc5f4 -s ours
am skip reason: change_id I5d1f41b90595238011eb0d1dc0ae0415157bb469 with SHA1 30347b2f9d is in history

Change-Id: I583a488e05547e17d699192a1fa9b4867264eb34