[automerger skipped] Fix a bug where the PAC proxy port is not set correctly. am: 25ef171b68 -s ours

am skip reason: Merged-In I95a979d232fb60ece2e33e972bf5d66d20357a1f with SHA-1 9fe47bee09 is already in history

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

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