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

Change-Id: I52b9cbd38282530f762ffea327c9b2adf3ccd69d