[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: 986ffdb2 -s ours

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

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

Change-Id: I23d11dc82ef0a5c8ee9d8fd7a429d3e770ad7586