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

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

Change-Id: I7c26bb8a04b6c56257ef8ecb44a4afa50826a85e