[automerger skipped] Merge "Expose SmsCbLocation and SmsCbMessage constructors" am: d87727f7d9 am: 850525ffaf
am: 6ac19321a7 -s ours
am skip reason: change_id Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1 with SHA1 0d76fbd0d9 is in history

Change-Id: I386558973299ca0998fd8bd214828e00a9935135