[automerger skipped] Merge "Add a carrier config to specify validation timeout for data switch." into qt-qpr1-dev
am:94a58bd978-s ours am skip reason: change_id Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 with SHA1448b51d41dis in history Change-Id: I8a6b3a61a165d4ca5986dc297926de9afe32380b
This commit is contained in: