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

Merge "Fix holding behavior across self-manged ConnectionServices." into udc-dev am: 390a9d13 am: 8d4b741e am: ee12c527 am: 6c7aa796

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



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