Merge "use public constructor for SmsCbLocation"
am: 134d6e8f3c

Change-Id: Ie9d526c1b98c71021d919567bb2f320d8e3fc5bc