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

Change-Id: I7c3c0d40398bba4d5319c975412a180632428ac7