Merge "Add missing atrace tag in OomAdjuster"