[automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours
am: ec2c5c2e18

Change-Id: I96f8f4a9434bd46fb4f203099f12e2ea8a1f9ed5