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

Change-Id: I0af62222403ca14f37d4435ae2ea4db1f2670efe