Merge "expose systemAPI for SmsCbLocation constructor"
am: 174b988133

Change-Id: Id44432a314e2becf72818f445120dbbe8367f9bc