Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev