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

Change-Id: Ic319642d1ef01f658c4d0b74bbaeaeead91dc76e