[automerger skipped] Merge "DO NOT MERGE DSDA: Set call EXTRA if either sub doesn't allow hold" into udc-qpr-dev am: c0eadc8f28 am: 94cbd8d198 -s ours

am skip reason: subject contains skip directive

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

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