Merge "Cleanup setGlobalProxy" am: 376274c277

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

Change-Id: I0052f30d52f00f40b933eb1573b1a0de37e9cba2
tree: f34acd59e686b577a60f604549df8d362029de21
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING