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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I357e0f8a50b2619241f5edc4c3e0fdf3049f232f