Merge "Revert "Change thread suspend timeout to be fatal for non-debug""
am: bd4e4f23ad

Change-Id: I153a14d3ad1a2ba7cdc4d3f70b7dc5e425809802