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

Change-Id: I49777eca9e9435048f4e33af7f81fe34a2b91a3e