[automerger skipped] Merge "Prevent a deadlock in #abandon" into rvc-dev am:...

[automerger skipped] Merge "Prevent a deadlock in #abandon" into rvc-dev am: 69c5cac4 am: 24507e02 am: c2655c30 -s ours

am skip reason: Change-Id I512ea07a4f8750431b306fa6e3c47a600a50b64f with SHA-1 8a207c40 is in history

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

Change-Id: I057ffede18214fb12caf7d5b7559e255238e0d63