Merge "Cleanup setGlobalProxy" am: d14c0bcc22 am: ee5a9dacd0

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

Change-Id: I0a8d51af2280d47f3924f66d56e529f57057b3bb