Merge "Remove cached services when the network is disconnected or unrequested" into main am: 6a7e703f17

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

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