Merge "Refactor setCurrentProxyScriptUrl to a void method" am: 361e0a91a6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24bb3882c467aa590e37e858df875825221c88a0