Merge "Add NetworkOfferCallback to NetworkInterfaceState" am: a6f94a31b8

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2054250

Change-Id: I39b09007076ba656927858c597306430a30299ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>