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

Change-Id: Icff53f39bdb0a2d7d7c45d53800fff1e7b35fdd0