Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec

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

Change-Id: If9bd154836ab8b17ae5ea9afdefbf20f632548c6