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

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

Change-Id: I8897f5b78a632ed123d38bd5564c814a0feef38f