Merge "[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started"