Merge "SMS over IMS APIs revision" am: 2bf7f03e63
am: f9eba1a18f

Change-Id: Ia7bdaeee0ca3942d72d9e92faa78a947fe1d4616