Merge "Prevent LocalService#updateOomAdj been called during test"