Merge "Fix the notification issue shown on startForeground" am: ea86140ba4
am: 3b498d1c56

Change-Id: Ibd6d57617c6d7d8ad2bffebb6f72337e7d11e9af