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

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

Change-Id: Ia558c036bc87686d46ccf0528dc9cd8d44085af5