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

Change-Id: I6aee27637c126e3c02dd7e6f5da234a7905b6525