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

Change-Id: I380c79b964554a7a3385a084cffd3ef68f821a6f