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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife8213b304f5645ed3f9f181576163aa7cec9f11