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

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

Change-Id: I6495dedf7f44c104e97bb9ac34c49a1c71a40670