[automerger skipped] Merge "Prevent a deadlock in #abandon" into rvc-dev am: 69c5cac4 am: 1bf197ca am: 8dd5f4e4 am: 491572c9 -s ours

am skip reason: Change-Id I512ea07a4f8750431b306fa6e3c47a600a50b64f with SHA-1 4ce1273f is in history

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

Change-Id: I321f9d88341a2ff521fb85b8c9147c8afc7f9450