Merge changes from topic "PerNetworkServiceTypeClient" am: 71c006bd14

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

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