[automerger skipped] [NS05] Feed network offer callbacks am: 0354d8c7e0 am: b6fac46c0d -s ours am: dcb5aac3dd -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: I76c9cb57fbb22fdbe1862a00e9abd58597cb84c5
This commit is contained in: