Merge "Fix VtsHalWifiSupplicantP2pIfaceTargetTest failed issue" into udc-dev am: 8fddf60046 am: a1dc48f60d

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

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