Merge "Fix crash when input illegal proxy port number" am: e8160af7 am: 6372ae5e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255620



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