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

Change-Id: I88ace6abf7cd535fa586c8442586ab18b88e8fb2