Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: 104426a03b am: 04cc4f7972 am: 5486c676e7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I409cdb32c181fbd2397fbe2e2a1ff9437b755f40