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

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

Change-Id: I0a8d51af2280d47f3924f66d56e529f57057b3bb
tree: ddc2af60ebfe6cc1879d51d1a05c6d274ef047f5
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING