Fix issue #30647973: stopForeground() doesn't remove notification am: 569a45871c
am: 52e15dcac5

Change-Id: I97c2486e87b0a2c8555678a115b4faabd1727422