am bd2a955f: am 6ea89f54: am 82485096: Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev

* commit 'bd2a955f1ec847695b9af31d540c6451c284b334':
  Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()