[automerger skipped] Merge "DO NOT MERGE Added a new carrier config for data...
[automerger skipped] Merge "DO NOT MERGE Added a new carrier config for data connection failed radio restart" into pi-dev am: 08784b50 -s ours
am: 7cc10964 -s ours
Change-Id: Ia6c3dd7ce12691da910bd0daa5f7666633fe9b45