Merge "Add new error code in SmsManager" into oc-mr1-dev
am: 1dafcc89a5

Change-Id: I938ddabfe0d98ee1eee850ba9d6aeb857ebb748f