am 1e944479: am 367921dd: (-s ours) Merge "Toast: fix force close if called from system service"

* commit '1e9444797d17add3fc4960239a5ed0bc61ce972d':
  Toast: fix force close if called from system service