Merge "Set the ipVersion when converting QosPolicyParams to the HAL equivalent." into udc-dev am: ca403a5136

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/23592727

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