Merge "Fix issue #25727069: Top sleeping activity overrides foreground service" am: 683168c10f
am: d6d50464dc

* commit 'd6d50464dc4591eb615977531a6b3f58e6b86288':
  Fix issue #25727069: Top sleeping activity overrides foreground service

Change-Id: I32e9d6906f4f6e10aee927b2ff0a4414a419c47a