[automerger skipped] Handle race between UID state and activty resume
am: bd39b49f11  -s ours

Change-Id: Icdfaa64e05d7cdc8d7747621f22e4b26b55980e5