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

Change-Id: Icd38c1a273efb253e346958d0b6b13f3b50c0a3e