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

Change-Id: I18b420b6dd5db0621e351db7f503700fc297329e