[automerger skipped] Merge "use public constructor for SmsCbLocation" am: 134d6e8f3c am: b66bf386db
am: 11b76dea7c -s ours
am skip reason: change_id I533e4c57faab1566ba17e88aa493178d429d857a with SHA1 7feb7b0e2d is in history

Change-Id: Ifbdb2f6e1d8192759f8cf69ea36cea40680332a0