[automerger skipped] Merge "expose systemAPI for SmsCbLocation constructor" am: 174b988133 am: da22ddac87
am: f3d94810f1 -s ours
am skip reason: change_id I7b9c6fa453ee907aaa13d65e0b13de0556852313 with SHA1 8635f37b96 is in history

Change-Id: Ie50cbcf22e3aecb1cb837a94346af7e2b19fc37b