Merge changes from topic "PerNetworkServiceTypeClient" am: 71c006bd14

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

Change-Id: Ia4fd7b684d351922ad392eccbb82fd4c69764359
Signed-off-by: Automerger Merge Worker <[email protected]>