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

Change-Id: I37760e16144a1707802fda5ef974a2b86d6b8a7b