[automerger skipped] Add a carrier config to specify validation timeout for data switch. am: f1239756b5 -s ours
am: d5acc4c0f7 -s ours
am skip reason: change_id Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 with SHA1 58f8d0f255 is in history

Change-Id: I092298f44b623c6e297397703e852d66c5d42de8