Merge "Fix public issue #18054: USSD in-call toast"
am: 7b12c33114

Change-Id: Ia976fe29d54e4c8c9af1853f9c09a117f64747db