Merge "Call waiting support USSD function" am: 7d07fce12b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667001

Change-Id: I64f1376ff2095248c588ead35bba802b3199741a