Merge "Fix memory overflow in ESQueue am: 91fed774 am: 979ebeac am:...

Merge "Fix memory overflow in ESQueue am: 91fed774 am: 979ebeac am: 6f24da9b am: 8381c1ef am: a26215a1 am: d48bd420 am: 8447914a am: 3624115d am: 33376304" into rvc-qpr-dev-plus-aosp am: 7579b830 am: b067c90e

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

Change-Id: I373fd4bae7ada516b3f9da3d5b7afda1f25a89c3