[automerger skipped] [NS05] Feed network offer callbacks am: 0354d8c7e0 am: b6fac46c0d -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/+/1722739
Change-Id: I4b657a482d81244d4f3d11647d778ce1d075f1d5
This commit is contained in: