Merge "Dump cached services" into main am: e5ae809e9f

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

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