Thread suspension cleanup and deadlock fix am: 7c39c86b17 am: d450a3dcdf

Original change: https://android-review.googlesource.com/c/platform/art/+/2171862

Change-Id: Id13adcdb7ef386f2a1011f7baddaf340f6e48c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>