Merge "Add NetworkOfferCallback to NetworkInterfaceState" am: a6f94a31b8 am: a4e8999733

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

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