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

Change-Id: Ic95c9c78b05c4f4920c04a654296d2a6e4283eea