Merge "Declare new SMS error code in SmsManager" am: ea337540f0 am: b670c62130

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495901

Change-Id: I9d5df2b6dff4d8b23020f5c34d4450b83eacc62d