Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7

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

Change-Id: I7e7ec3721de73523f52718665bc1763f75184a56