Merge "Add type string to VCN NetworkAgentConfig" am: 0b957a2f89

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

Change-Id: I148ecf133070ab3514991d5440f5414513f07ce6