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

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

Change-Id: Ia16a26e64e65687faf6303c392c4a85de52129e3