Merge "Fix race condition in linearblock release between TIS and MediaCodec" am: 49467f1cdf am: 409784587c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I275c220f840dd3683ecdc8f59c8eae05e24295e0