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

Change-Id: I7be431d8619f9154cdc433df048e6082495b5b5a