Merge "Add a carrier config to specify validation timeout for data switch." am: 0549e43f1d
am: 464fbf714c

Change-Id: Ia59c369283af6add89234f37c46a388acff0a909