Merge "Ensure GetThreadState only counts user-code suspensions" am: 71a8e5b25f
am: e87557b9d0

Change-Id: I3aa0c991e4457f00973f43aaeeb204b1649c7517