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

Change-Id: I9fbb862797a59459e8513c1b31e6a2c2d0684883