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

Change-Id: Id41b7b5138f12cb366c18f9da2cbea7a6820a212