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

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

Change-Id: Ief038d398163489579d4a932e79e11f641e4227c