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

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

Change-Id: If75cc1d84d69e7cf3c38fe0fcbfa1e2d21a1661d