Merge "Cleanup setGlobalProxy" am: 376274c277 am: 676eccd672 am: 8cce6d3336

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

Change-Id: Ic9757060f398aaf871141dc5199bf49988637937
tree: f8aae0dd4c4292857b04a643c154107f5c16513a
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING