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

Change-Id: Ibba6c001815a66efd4d1ec5a95c5d2768a11482b