Merge "Call waiting support USSD function" am: d34518e478 am: a64b1c0418

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

Change-Id: I93a960f89c406f29ca236d23b6fde3af88a7b72d