Merge "ActivityManagerService: ensure updateOomAdjLocked gets called early" into pi-dev