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

Change-Id: Iea7624e10230294505982f0373b97a2486d6996f