Merge "Add new error code in SmsManager" am: 387ed22fef am: 782395561d
am: 6fab5790bf  -s ours

Change-Id: I99e7acc32497a0c78ac30090d5f34c897921f908