Merge "Whitelist user_code_suspension_lock_ for ConditionVariable wait"
am: 6c13ce8b4c

Change-Id: Ia70e9704af5f4ff415c9a65aff87140bc9d0ea07