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