[automerger skipped] Merge "Call waiting support USSD function" am: 7d07fce12b am: cf85599687 am: c85f675035 -s ours

am skip reason: skip tag Change-Id I607da1f7c4748303c848f755e668854307c53d15 with SHA-1 7718c20533 is already in history

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

Change-Id: Ifc56e624a454d0302dce05c784477076c1ea51fe