Merge "Update Docstring for SmsMessage.getOriginatingAddress" am: 14513e0ea3 am: 79f3dcb694
am: c6ee8d63eb  -s ours

Change-Id: Iadcf1841a2d37173aeac8f4adc8648772252d5d6