Merge "Check PendingStartActivityUids list before updateOomAdj is done." into rvc-dev am: 600ce540ca

Change-Id: Ic0af8fa5f1e9bcaa9b7eeb2aba990524024f013e