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

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



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