Merge "Fix holding behavior across self-manged ConnectionServices." into udc-dev am: 390a9d136f am: 8ca48d5b87

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23036398

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