tree a925ca9028129b094e2bcfd814325adf9fe1c171
parent d135928561947b13eebb088ff6ba91667bd488cb
parent 4887f876f9cbaeb156d14b96f94b56af5f3acf25
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1572980446 -0800
committer android-build-merger <android-build-merger@google.com> 1572980446 -0800

[automerger skipped] Merge "Add a carrier config to specify validation timeout for data switch." am: 0549e43f1d am: 464fbf714c
am: 4887f876f9 -s ours
am skip reason: change_id Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 with SHA1 58f8d0f255 is in history

Change-Id: Ief943aa3d46caba29fcbf1596e98425168eb4f71