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

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

Change-Id: Iac01f47d24310592959c1f3ec0766ccd2221596c