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

Change-Id: Ib0f83fbe7aecb42c86a1532dfe8661aaf18fe170