Merge "Wait for validation of WiFi in OEM pref test" am: c60c1bc24e am: e6becb6820 am: 2e6b0599ab

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

Change-Id: Iebba7b888f2643a8aedd1026f887a8c1bb3cbf14