Merge "Shorten a timeout" am: a200fe8c1c am: f4016713ae

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1877219

Change-Id: Iae749b9f2bc189ce41c7c0b4523db543469f515d