Merge "Cleanup setGlobalProxy" am: 0656c4314c

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

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