[automerger skipped] [NS04.5] Have NetworkOffer embark a provider ID am: 30689b8fd7 am: c79f3f3a38 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722736
Change-Id: I1425f823b74c34d72528144af9f17d60fc6f1408
This commit is contained in: