Merge "Call waiting support USSD function" into sc-dev am: d85a1c66a2

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

Change-Id: I88784cd7b1a36fc51be0b948a1e661c8400c1559