Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" am: d92daec786

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

Change-Id: I53e05e622e1d89dd70798855eee79ceb67c1edaf