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

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

Change-Id: I067d6ade2fb8cb7726bab93757a356597c8e8211
Signed-off-by: Automerger Merge Worker <[email protected]>