[automerger skipped] Merge "Fix race condition in linearblock release between...

[automerger skipped] Merge "Fix race condition in linearblock release between TIS and MediaCodec" am: 49467f1c am: 40978458 am: b4624bfd -s ours

am skip reason: Change-Id I13f924adc3586607eb3a60d184e7786536c7b788 with SHA-1 7bff9d57 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5d9a261504099f5f08a6daa20e93b6d233ef3d0