Merge "When a sent-notification is delivered, return error code as mentioned...
Merge "When a sent-notification is delivered, return error code as mentioned in SmsManager." am: 34cfeb48
am: da6a441e
Change-Id: Idf02e0a5a5dc995c72cb8110bbd200d1b0491df1