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

Change-Id: I197eded4a3c0015345d7d62ab2c655db558db636