am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

* commit '70b1f88baed5b195b33883a3253f79cd44eafca8':
  [USSD] Consolidate USSD messages in a single dialog box