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

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

Change-Id: I1988750dd4b65a3d74c33c8fc120bb3bcb705320
tree: c7b6f480ec10df4267489b807fcbdb6029d7634d
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING