[automerger skipped] Merge "Add type string to VCN NetworkAgentConfig" into...

[automerger skipped] Merge "Add type string to VCN NetworkAgentConfig" into sc-v2-dev am: 8e4f34e4 -s ours am: d3db7233 -s ours am: 6e8a2246 -s ours

am skip reason: Merged-In I059dbc997f97482f7355fdc29d464d5452933ce3 with SHA-1 37a6ef1c is already in history

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

Change-Id: I3e2363aa30dc2feea154fe644cc9f0fb72529650