Merge "Fix VtsHalWifiSupplicantV1_3TargetTest fail" into stage-aosp-sc-ts-dev am: 3dedd1a0fe am: dc8303b4ae am: 09a3f19711

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15847170

Change-Id: I6227fe9b0bed3753ba041c0ccc30f1b6319b2540