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

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

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