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

Change-Id: Ie498778c0f353acfd29ef6003211d2726ad92d18