Merge "Fix VtsHalWifiSupplicantP2pIfaceTargetTest failed issue" into udc-dev am: 8fddf600 am: 8cdff7f6

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



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