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

Change-Id: Icf725c22df4041be24fc68bdfd854887d3e8c9be