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

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

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

Change-Id: Ic43a2b4e8c91d8c79347a891117eb0e341c43949