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: I73e3aca1daff44de427bc8d92cf6724348b87db8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>