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

Change-Id: Ib0312f964bc8d67aec37143e955a36fb919130cc