Merge "Fix testUpdateOomAdj_DoOne_AboveClient_NotStarted" into main