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

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

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