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

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

Change-Id: Ida29e5eaa577745ca5fff211177bc64c61059fc5