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

Change-Id: Icf7012a3dd64564704409174236e2eff5a2447f9