[automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error."
am: 2eb5d0c183 -s ours
am skip reason: subject contains skip directive

Change-Id: I624a81986dd78ebf6ed2b1c86782834bbebd4a45