Merge "wifi: Skip SetStrictConversativePeerMode VTS test" into udc-dev am: abb157f297

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

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