Merge "Prevent a deadlock in #abandon" into rvc-dev am: 69c5cac4c1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11983819

Change-Id: I47d47aa389ce94c06ac6412434573d9137252310