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

Change-Id: Ie6cc66a3525379678a9362e9e31990adc85bc6e8