Fix for Thread::QuickDeliverException. am: 9568704c61 am: 2b61394257

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

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