Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" into sc-dev am: 9eee7d3f29

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

Change-Id: I95583dcea69d627eefc6074f50efd0f152d7b7d6