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

Change-Id: I751e42c07ca14c6d561e235eb878273a14e98a52