Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec am: b13c54fd94 am: 1ba78e5f40 am: 343d04c64b

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

Change-Id: I4434d406567a52ec483fc55dd84e94a0c46c105a