Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9 am: 3786083176

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

Change-Id: Ia16a26e64e65687faf6303c392c4a85de52129e3
tree: e5c460df3a5da7dda8c4b0083a4a18236fa0400b
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING