Merge "Expose SmsCbLocation and SmsCbMessage constructors"
am: d87727f7d9

Change-Id: I24bfb6ed5fa25a810c2a5fe78745091f5b576162