[automerger skipped] Merge "Crash app on foreground service notification error." into qt-qpr1-dev
am: eac3b706 -s ours
am skip reason: change_id I36ea0137ca6978ff401f64dccacb6f2edcadd7db with SHA1 5df725a9 is in history
Change-Id: Ibadd3561473bbd7a890b47d51263903470b1e66b