[automerger skipped] Revert^2 "Use RAII for preventing user-code suspensions"
am: e574f042fe -s ours
am skip reason: change_id I1a48138846a2b76de6f81bb3caca82c5e771712d with SHA1 679dec1c8a is in history

Change-Id: I9c60a9fea584cace494524d79ac34c64ce9a4701