Merge "Fix race condition in OomAdjuster." into rvc-dev am: 2a6add988c am: 863ecc25df

Change-Id: I7ebac8f125b5ea3650808ff8cd23399e41e26c35