Merge "Make lingering delay 2000ms in testMultipleLingering" am: 47b95be1c9 am: 3c3f459a94

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

Change-Id: Ia218f4165f269fab50ed0800830f6b1674b915ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>