Merge "Cleanup setGlobalProxy" am: 0656c4314c am: 42fbe21e61

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

Change-Id: I0a8d51af2280d47f3924f66d56e529f57057b3bb