Merge "Expose SmsCbLocation and SmsCbMessage constructors" am: d87727f7d9
am: 850525ffaf

Change-Id: I905e9aff73ac79a4a8e917296bb8bc0077371844