[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 -s ours am: 46f99bdb -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: I9d6dee35311f03471b488b5a2234224fb350a8c6