Merge "Fix a bug where the PAC proxy port is not set correctly." am: f2b38772ac

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729153

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