am 3cce14e8: Merge "Bug 4903178 Restore priority and cgroup on stop"

* commit '3cce14e8fff950f7e7c8b1649ad4ecbcdefedf6b':
  Bug 4903178 Restore priority and cgroup on stop