Merge "Update Docstring for SmsMessage.getOriginatingAddress" am: 14513e0ea3
am: 79f3dcb694

Change-Id: I4b3369fb2a75234e9100630cc7a2ebf49855d722