Merge "DO NOT MERGE Crash app on foreground service notification error."