[automerger skipped] Revert^2 "Perform SetEvent under the user_code_suspend_count_lock_"
am: 817eb04c81 -s ours
am skip reason: change_id I8359e595cdd73f49cb68c8c70d755cab0e563ac7 with SHA1 66834468e9 is in history

Change-Id: I26a8465fc53357fd2d674dd5655f72304ddf89b5