Merge "Add new error code in SmsManager" into oc-mr1-dev