Fixed incorrect carrier config format Bug: 198831438 Test: atest CarrierConfigTest Merged-In: I972672f1a4a9c4a899bac11af7edd6348f534885 Change-Id: I972672f1a4a9c4a899bac11af7edd6348f534885 (cherry picked from commit 3ab7cd5c1e4912e89ec13eba8630b86237f3d9a4)