am 2425b0f3: am 18636118: am 1648dba0: am ea7a7052: am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

* commit '2425b0f354ace1d92345d5d4c2c25491774ee0d1':
  [USSD] Consolidate USSD messages in a single dialog box