tree fb84447459e6da26a1014a8608e5a6e0562edc55
parent fb835ee053ebfc81f22ce52a31ed121b5417f226
parent d34518e4783c56ea017bfc8ebe01b964882995fe
author SongFerng Wang <songferngwang@google.com> 1618198519 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618198519 +0000

Merge "Call waiting support USSD function" am: d34518e478

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

Change-Id: Ie295ad9961c2add921b9650366e887915fd97faf