Merge "Handle race between UID state and activty resume" into pi-dev
am: 63a0662d03

Change-Id: I86885fd280a906e8a5d5df82b23d1789931537b1