Merge "Shorten a timeout" am: a200fe8c1c

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

Change-Id: I10b9f07a30bd017904e4c8c6bc9c38aa49f9c1b1