Merge "Use Sms.CONTENT_URI regardless of the message box"
am: 8b16ac1fc1

Change-Id: Id3de934427c4fe4c1ab7abdfc571d7cafb3bff49