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

Change-Id: Iaab48972f36394dd672db2207bc43ab5785909a7