Merge "Wait for validation of WiFi in OEM pref test" am: c60c1bc24e am: e6becb6820 am: 11efc29041

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

Change-Id: I1c73a47673aaf31020f7392340df0ffda43f46fa