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

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

Change-Id: Id20f014a1516cff68cb743ac9fa45dc7de16ae56