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

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

Change-Id: I22741305c5b6139891b1630331f3cd1094b4219a