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

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

Change-Id: I1dc7bd03e1041aa9853372d95a90a534460447df