Merge "Cleanup setGlobalProxy" am: d14c0bcc22 am: ee5a9dacd0 am: 4cde14bda2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148

Change-Id: Ic9757060f398aaf871141dc5199bf49988637937