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

Change-Id: Ic89b08da14e9d2ff88e38c08cfc4cb809868e0e3