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

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

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