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: bbfe630a am: db6cf815

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>