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

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

Change-Id: I438627f51aeebd18f05156d6a2f4c240dd3b26d3