Merge "Avoid calling updateOomAdj an extra time" into pi-dev
am: e5c8e375e1

Change-Id: I37d9c6ca73f7151805266caf5b6eec5fa55ab075