[automerger skipped] Merge "Update setupDataCall and DataCallResponse for 5G slicing" am: fee5062c am: db354a04 am: 01e72fc0 -s ours

am skip reason: Change-Id I94968331eb3049da74b75f3cd29497585d91977b with SHA-1 edea8f9f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1592925

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic268e1b409089d0b373e2e1be7320b3a064eeddf