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

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

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