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

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

Change-Id: I07e60e55a4cc615ea1c188ab2d4b105fbab971d6