Merge "Fix the notification issue shown on startForeground" am: ea86140b am: 3b498d1c am: fd0239aa am: d5bf76fe Change-Id: Ib3718fc61d476363ed4773588d391bd55b0779e7