Merge "Add SMS over IMS APIs"
am: 74445ed311

Change-Id: I5b08b82f39968adc111d0b3361b4312eb7244913