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

Change-Id: Ic1a8824e1f1d2e3a7655484d23ff658d3d5fd40d