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

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

Change-Id: Iabd9e232b70e8b56ee77e408e6a182f0fdec59fc