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

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

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