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

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

Change-Id: Ic0a2e5a05fa162f0d30e195b22000838af21f3c0