Merge "ActivityManagerService: ensure updateOomAdjLocked gets called early" into pi-dev am: 3148dbf80d
am: 1613024161

Change-Id: I4dc86dc5de5aede0d839aaca88837d60922740ae