Merge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc-mr1-dev am: a96e7ac463
am: d037a7676e

Change-Id: If204836452efa017cf8885bf64a95718f10c2ab9