Merge "Ensure calls are not unheld between apps automatically." into udc-dev am: 6225289f

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



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