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

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

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