[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
am: 28f41e7ea2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie876e8894ec5183d4fbb7ca4947e8460552e3208