[automerger skipped] Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" into sc-dev am: 9eee7d3f29 am: 66657e13ee -s ours
am skip reason: Merged-In I3a298a6c4c594c6e224f3f05764614802c00e9b0 with SHA-1 8d35744f98 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15344043
Change-Id: Ia25f78a1fdc0d18cb7d403127ede8ecfcc606eb0
This commit is contained in: