Merge "Add more sms error codes"
am: c16da498d5

Change-Id: Id19bb14ebea3b0124af3a5990613a15d8c2fa44c