[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." into qt-qpr1-dev
am: 033bed25 -s ours
am skip reason: change_id Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 with SHA1 7766b9f2 is in history
Change-Id: Id0f8ef1236cff6061e9a9b4d47a88a821416beed