[automerger skipped] Merge "Add a carrier config to specify validation timeout for data switch." into qt-qpr1-dev am: 94a58bd978 -s ours
am: 3b1c38ad2f -s ours
am skip reason: change_id Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 with SHA1 58f8d0f255 is in history

Change-Id: I0a145ddedd44e6bf0fd6820e4a30c1055ad1a0f5