Merge change 21770 into eclair

* changes:
  Fix issue #2047139: Remove Service.setForeground()