[automerger skipped] Merge "Call waiting support USSD function" am: 7d07fce1 am: cf855996 am: c85f6750 -s ours am: 2b84dcb9 -s ours

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

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

Change-Id: Ib47d672ba60d5701190860f9cc7502308ab68648