Merge "SCS: Don't convert source and dst IP addresses for adding scs policies" into udc-dev am: da8e9fb66a am: 157879d2dc am: 1d85ce8904

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/23592592

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