Merge "Revert "Add setSchedPolicyCgroup to AM service""