Merge "Whitelist user_code_suspension_lock_ for ConditionVariable wait" am: 6c13ce8b4c am: 79121e452c
am: eb6237ce61

Change-Id: I4da1376682c5e4c3092205e6828df7497520278b