Merge "Crash app on foreground service notification error."
am: 036ea39d96

Change-Id: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9