Merge "Check PendingStartActivityUids list before updateOomAdj is done." into rvc-dev am: 600ce540 am: 20710498 Change-Id: I763749a832be1dc404e6c6f80e40eb5446d4e067