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

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

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