Merge "Add new error code in SmsManager" am: 387ed22fef
am: 782395561d

Change-Id: I12924c377167e11889942f2bfba555a07b45d9ac