Merge "[Feature Sync] Remove expired service" am: efb5d60243

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

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