[automerger skipped] Merge "Copied NO_ERROR_CODE from SmsReponse" am: 8fc1403565 am: bea8f3ae63 -s ours

am skip reason: Change-Id I7d372a839fb8b9c7217d18b6913474e0bf4219b2 with SHA-1 81bb65e128 is in history

Change-Id: I3708c933bfe8e7fd14a0b8599ddbb65a035ebec6