[automerger skipped] Merge "Add a carrier config to specify validation timeout...
[automerger skipped] Merge "Add a carrier config to specify validation timeout for data switch." am: 607f8fcb am: 9de44a55
am: a0a95e94 -s ours
am skip reason: change_id Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 with SHA1 db254737 is in history
Change-Id: I89099a51c9b8310eb4726b4c175d4605b90bffa9