Merge "NetworkProvider: Do not propagate callbacks for unregistered offers" am: 1c37d3e7b0 am: 83ddf49e15

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

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