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

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

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