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

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

Change-Id: I8c78d3629b19da43b6fb82e736e39e34ff38bbcf