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

Change-Id: Iff96995b90ecd6ae7fcceebf6b2017344038be72