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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe8db1aa61ad9aea6719531634ef8a5d97197d8e