Merge "DO NOT MERGE DSDA: Set call EXTRA if either sub doesn't allow hold" into udc-qpr-dev am: c0eadc8f28

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

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