[automerger skipped] CSD: fix race condition when releasing patch am:...

[automerger skipped] CSD: fix race condition when releasing patch am: eafa048a am: 61eb35aa -s ours

am skip reason: Merged-In I1f1e585c974632d015d318fe616364009cefdd96 with SHA-1 2750604b is already in history

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



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