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

Change-Id: I6af10951b51d739a1e0500cefe5d1d07f7742c27