[automerger skipped] Merge "Call waiting support USSD function" am: d34518e478 am: a64b1c0418 am: e33c1bb8d3 -s ours

am skip reason: skip tag Change-Id Ia03fd4ddef1defb1f0f9091c58ab0f1e43936457 with SHA-1 0e76799364 is already in history

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

Change-Id: Ida05e44e754311bb4c9932c94232fb87ab11fe0a