Merge "Rename APIs in NetworkAgentConfig.Builder" am: a0445d3546

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

Change-Id: Ia437814497ef603043980c37add9e2ddfccf11c9