Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97d232b365e868b1533d0600778f7dbb823a4d2a