Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: 104426a03b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5aafc615748eb2f854afe04108ffa7bf6d1ff47b