Merge "Call waiting support USSD function" am: d34518e478

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

Change-Id: Ie295ad9961c2add921b9650366e887915fd97faf