Merge "Check PendingStartActivityUids list before updateOomAdj is done." into rvc-dev am: 600ce540ca am: 20710498ee am: 83c9a2667e am: 7237e88f19

Change-Id: Iba95dd849d12f5499ffbcda7340b9409b1372e6a