[automerger skipped] Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and...

[automerger skipped] Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" into sc-dev am: 9eee7d3f am: 66657e13 -s ours am: af3e183b -s ours

am skip reason: Merged-In I3a298a6c4c594c6e224f3f05764614802c00e9b0 with SHA-1 8d35744f is already in history

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

Change-Id: I8c6b2e2666908a29202b601b1272a9eee30e24bf