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

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

Change-Id: Iffe8f936bf8217782b645e95c51200ec50d13391