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

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

Change-Id: Ic9757060f398aaf871141dc5199bf49988637937
tree: be0b9b453fe1d2ae27e47a894c799118555841c5
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING