Merge "Fix VtsHalWifiSupplicantP2pIfaceTargetTest failed issue" into udc-dev am: 8fddf60046 am: a77d0e10dc am: 7830c15357

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

Change-Id: I4aa5e679fec6cae35e0ead53db0f8282201a72d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>