Merge "Consider NetworkOffer is unneeded if it cannot satisfy the request" am: b028fc7cf1 am: ce077a3ad0 am: 8b1a98ff38

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

Change-Id: Id7ea1cace4e3cb87c60560f5cf4184f3ab164c82