Merge "Update the order in which we apply new proc_state/oom_adj values." into sc-dev