Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU"

* changes:
  Revert "Set setCurrentProxyScriptUrl as public"
  Revert "Move service-connectivity to the tethering APEX"