Merge "Merge "Add new error code in SmsManager" am: 387ed22f am: 78239556 am: 6fab5790 -s ours am: d8971864 -s ours"