Bug: 135956699
Test: cts SmsCbLocationTest
Change-Id: I7b9c6fa453ee907aaa13d65e0b13de0556852313
(cherry picked from commit 8635f37b96)
Merged-in: I7b9c6fa453ee907aaa13d65e0b13de0556852313
Bug: 135956699
Test: cts SmsCbLocationTest
Change-Id: I7b9c6fa453ee907aaa13d65e0b13de0556852313
(cherry picked from commit 8635f37b96)
Merged-in: I7b9c6fa453ee907aaa13d65e0b13de0556852313