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

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

Change-Id: I3ae25c6226351248cb8daffe3415b423db79650a