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

Change-Id: I1ede72a0126bd9b02492bc5d7a4b704e4b2cc25c