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

Change-Id: I9e687fb5adbb2c20d2932ace73b868920095bc41