Merge "Fix holding behavior across self-manged ConnectionServices." into...

Merge "Fix holding behavior across self-manged ConnectionServices." into udc-dev am: 390a9d13 am: 8ca48d5b am: adb82891 am: 19a6883c

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



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